Merge branch 'release-0.10.0' into 'master' (61215ac9) · Commits · REDMIC Project / Server / AIS

.gitlab-ci.yml

+1 −7

Original line number	Diff line number	Diff line
		@@ -23,9 +23,6 @@ stages:
		- post-package
		- deploy

		variables:
		PROJECT_PARENT_NAME: vessel

		.docker-build:
		variables:
		DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}
		@@ -33,7 +30,4 @@ variables:

		.deploy:
		variables:
		STACK: ${PROJECT_PARENT_NAME}
		SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
		environment:
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		STACK: vessel

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

		COPY /dist/*.jar ./

		ARG MICROSERVICE_NAME=ais
		ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}

		ARG MICROSERVICE_PORT=8090
		ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}

		EXPOSE ${MICROSERVICE_PORT}

+1 −1

+1 −1

+2 −5

Original line number	Diff line number	Diff line
		version: '3.5'
		version: '3.9'

		services:
		ais:
		@@ -9,6 +9,7 @@ services:
		args:
		PARENT_IMAGE_NAME:
		PARENT_IMAGE_TAG:
		MICROSERVICE_NAME:
		MICROSERVICE_PORT:
		environment:
		MICROSERVICE_NAME:
		@@ -29,10 +30,6 @@ services:
		deploy:
		mode: replicated
		replicas: ${REPLICAS:-1}
		labels:
		traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		traefik.port: "${MICROSERVICE_PORT}"
		restart_policy:
		delay: ${RESTART_DELAY:-1m}
		update_config: