Actualiza comportamiento de CI (cd5181a8) · Commits · REDMIC Project / Server / Vessel / Vessels

.gitlab-ci.yml

+45 −21

Original line number	Diff line number	Diff line
		@@ -9,10 +9,12 @@ maven-build-lib:
		stage: build-lib
		image: redmic/maven-gitlab
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		@@ -32,10 +34,15 @@ maven-build-commands:
		stage: build-services
		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/
		@@ -56,10 +63,15 @@ maven-build-view:
		stage: build-services
		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/
		@@ -139,15 +151,17 @@ deploy-commands-dev:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-commands
		ACTIVE_PROFILE: pre
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: dev/commands
		name: dev/${CI_PROJECT_NAME}-commands
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- dev
		@@ -159,15 +173,17 @@ deploy-view-dev:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-view
		ACTIVE_PROFILE: pre
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: dev/view
		name: dev/${CI_PROJECT_NAME}-view
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- dev
		@@ -179,15 +195,17 @@ deploy-commands-supporting-branch:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-commands
		ACTIVE_PROFILE: pre
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: dev/commands
		name: dev/${CI_PROJECT_NAME}-commands
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- branches
		@@ -203,15 +221,17 @@ deploy-view-supporting-branch:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-view
		ACTIVE_PROFILE: pre
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: dev/view
		name: dev/${CI_PROJECT_NAME}-view
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- branches
		@@ -227,15 +247,17 @@ deploy-commands-pro:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-commands
		ACTIVE_PROFILE: prod
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_TAG}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.prod.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: pro/commands
		name: pro/${CI_PROJECT_NAME}-commands
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- tags
		@@ -248,15 +270,17 @@ deploy-view-pro:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-view
		ACTIVE_PROFILE: prod
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_TAG}
		COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.prod.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=${ACTIVE_PROFILE} 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}
		environment:
		name: pro/view
		name: pro/${CI_PROJECT_NAME}-view
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- tags

Dockerfile

+2 −3

Original line number	Diff line number	Diff line
		@@ -4,9 +4,8 @@ ENV SERVICE=undefined-service

		COPY //dist/.jar ./

		EXPOSE 8091 8092
		EXPOSE ${COMMANDS_PORT} ${VIEW_PORT}

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

docker-compose.vessels-commands.tmpl.yml

+6 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,14 @@ version: '3.5'

		services:
		vessels-commands:
		image: registry.redmic.net/redmic-server/${UNIT_NAME}:${IMAGE_TAG:-latest}
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		environment:
		- SPRING_PROFILES_ACTIVE
		- MICROSERVICE_NAME
		- MICROSERVICE_PORT
		- SERVICE
		- SPRING_PROFILES_ACTIVE
		- OAUTH_CLIENT_ID
		- OAUTH_CLIENT_SECRET
		- JAVA_OPTS=-Xmx768m -Xss768m
		networks:
		- kafka-net

docker-compose.vessels-view.tmpl.yml

+6 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,14 @@ version: '3.5'

		services:
		vessels-view:
		image: registry.redmic.net/redmic-server/${UNIT_NAME}:${IMAGE_TAG:-latest}
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		environment:
		- SPRING_PROFILES_ACTIVE
		- MICROSERVICE_NAME
		- MICROSERVICE_PORT
		- SERVICE
		- SPRING_PROFILES_ACTIVE
		- OAUTH_CLIENT_ID
		- OAUTH_CLIENT_SECRET
		- JAVA_OPTS=-Xmx512m -Xss512m
		networks:
		- elastic-net