Merge branch 'dev' of gitlab.com:redmic-project/server/ais into dev (62ce6e26) · Commits · REDMIC Project / Server / AIS

.gitlab-ci.yml

+8 −4

Original line number	Diff line number	Diff line
		@@ -119,16 +119,17 @@ deploy-dev:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		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} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		only:
		- dev

		@@ -145,16 +146,17 @@ deploy-supporting-branch:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		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} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		only:
		- branches
		except:
		@@ -175,12 +177,14 @@ deploy-pro:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		SPRING_PROFILES_ACTIVE: prod
		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} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+0 −18

Original line number	Diff line number	Diff line
		@@ -6,21 +6,3 @@ services:
		- target: ${MICROSERVICE_PORT}
		published: ${MICROSERVICE_PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${MICROSERVICE_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

deploy/docker-compose.prod.yml

+0 −17

Original line number	Diff line number	Diff line
		@@ -3,23 +3,6 @@ version: '3.5'
		services:
		ais:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${MICROSERVICE_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

deploy/docker-compose.tmpl.yml

+20 −1

Original line number	Diff line number	Diff line
		@@ -15,16 +15,35 @@ services:
		- redmic-net
		- traefik-net
		healthcheck:
		test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health
		test: wget --spider -q http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/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/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		traefik.port: "${MICROSERVICE_PORT}"
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

		networks:
		kafka-net:
		external: true

		redmic-net:
		external: true

		traefik-net:
		external: true