Unifica compose y agrega host a regla de entrada (15169b26) · Commits · REDMIC Project / Server / Vessel / Vessels

.gitlab-ci.yml

+16 −7

Original line number	Diff line number	Diff line
		@@ -182,16 +182,17 @@ deploy-commands-dev:
		SPRING_PROFILES_ACTIVE: pre
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-commands
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- dev

		@@ -210,6 +211,7 @@ deploy-view-dev:
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -217,9 +219,10 @@ deploy-view-dev:
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-view
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- dev

		@@ -237,16 +240,17 @@ deploy-commands-supporting-branch:
		SPRING_PROFILES_ACTIVE: pre
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-commands
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		only:
		- branches
		except:
		@@ -269,6 +273,7 @@ deploy-view-supporting-branch:
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -276,9 +281,10 @@ deploy-view-supporting-branch:
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev/${CI_PROJECT_NAME}-view
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
		only:
		- branches
		except:
		@@ -300,13 +306,14 @@ deploy-commands-pro:
		SPRING_PROFILES_ACTIVE: prod
		OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro/${CI_PROJECT_NAME}-commands
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
		@@ -329,6 +336,7 @@ deploy-view-pro:
		OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}
		ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -336,6 +344,7 @@ deploy-view-pro:
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro/${CI_PROJECT_NAME}-view
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

deploy/docker-compose.vessels-commands.dev.yml

+0 −17

Original line number	Diff line number	Diff line
		@@ -6,23 +6,6 @@ services:
		- target: ${COMMANDS_PORT}
		published: ${COMMANDS_PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${COMMANDS_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/commands
		traefik.backend: ${UNIT_NAME}-commands
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '2'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		commands-vol:

deploy/docker-compose.vessels-commands.prod.yml

+0 −16

Original line number	Diff line number	Diff line
		@@ -3,25 +3,9 @@ version: '3.5'
		services:
		vessels-commands:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${COMMANDS_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/commands
		traefik.backend: ${UNIT_NAME}-commands
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '2'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		commands-vol:

deploy/docker-compose.vessels-commands.tmpl.yml

+20 −1

Original line number	Diff line number	Diff line
		@@ -17,11 +17,30 @@ services:
		volumes:
		- commands-vol:/tmp/kafka
		healthcheck:
		test: wget --spider -S -t 3 http://localhost:${COMMANDS_PORT}/api/${UNIT_NAME}/commands/actuator/health
		test: wget --spider -q http://localhost:${COMMANDS_PORT}/api/${UNIT_NAME}/commands/actuator/health
		interval: 30s
		timeout: 10s
		retries: 3
		start_period: 2m
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${UNIT_NAME}/commands
		traefik.backend: ${UNIT_NAME}-commands
		traefik.port: "${COMMANDS_PORT}"
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '2'
		memory: 1G
		reservations:
		memory: 820M

		networks:
		kafka-net:

deploy/docker-compose.vessels-view.dev.yml

+0 −17

Original line number	Diff line number	Diff line
		@@ -6,20 +6,3 @@ services:
		- target: ${VIEW_PORT}
		published: ${VIEW_PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${VIEW_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/view
		traefik.backend: ${UNIT_NAME}-view
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 768M
		reservations:
		memory: 615M