Actualiza comportamiento de CI (54c73916) · Commits · REDMIC Project / Server / Socket

.gitlab-ci.yml

+21 −4

Original line number	Diff line number	Diff line
		@@ -8,10 +8,15 @@ maven-build:
		stage: build
		image: redmic/maven-gitlab
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}
		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		@@ -90,12 +95,16 @@ deploy-dev:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD=${TEST_USER_PASSWORD}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -109,12 +118,16 @@ deploy-supporting-branch:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD=${TEST_USER_PASSWORD}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -132,12 +145,16 @@ deploy-pro:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_TAG}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=prod IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=prod OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD=${TEST_USER_PASSWORD}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

Dockerfile

+3 −4

Original line number	Diff line number	Diff line
		@@ -2,9 +2,8 @@ FROM redmic/redmic-server

		COPY /dist/*.jar ./

		EXPOSE 8089
		EXPOSE ${MICROSERVICE_PORT}

		ENTRYPOINT java $JAVA_OPTS \
		ENTRYPOINT java ${JAVA_OPTS} \
		-Djava.security.egd=file:/dev/./urandom \
		-Dlogging.level.org.springframework=${LOG_LEVEL} \
		-jar ${DIRPATH}/socket.jar
		-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

docker-compose.tmpl.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@ services:
		image: registry.redmic.net/redmic-server/${MICROSERVICE_NAME}:${IMAGE_TAG:-latest}
		environment:
		- SPRING_PROFILES_ACTIVE
		- OAUTH_CLIENT_ID
		- OAUTH_CLIENT_SECRET
		- TEST_USER_PASSWORD
		- JAVA_OPTS=-Xmx512m -Xss512m
		networks:
		- kafka-net