Merge branch 'dev' into 'master' (a9b4e3f8) · Commits · REDMIC Project / Server / Notification manager

.gitlab-ci.yml

+14 −18

Original line number	Diff line number	Diff line
		@@ -11,33 +11,29 @@ include:
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment-custom-image.yml'

		stages:
		- build
		- license-list
		- pre-package
		- package
		- test-package
		- post-package
		- deploy

		variables:
		DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}
		STACK: notification-manager
		PROJECT_PARENT_NAME: notification-manager

		.deploy:
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME}
		SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD} SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}
		SLACK_WEBHOOK_USERNAME=${SLACK_WEBHOOK_USERNAME} SLACK_WEBHOOK_CHANNEL=${SLACK_WEBHOOK_CHANNEL}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

		.deploy-development:
		.docker-build:
		variables:
		SPRING_PROFILES_ACTIVE: pre
		DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}
		DBLD_PARENT_IMAGE_TAG: ${REDMIC_SERVER_IMAGE_TAG}

		.deploy-production:
		.deploy:
		variables:
		SPRING_PROFILES_ACTIVE: prod
		STACK: ${PROJECT_PARENT_NAME}
		SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
		environment:
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

+4 −2

Original line number	Diff line number	Diff line
		ARG PARENT_IMAGE_NAME
		ARG PARENT_IMAGE_TAG
		ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server
		ARG PARENT_IMAGE_TAG=latest

		FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

		COPY /dist/*.jar ./

		ARG MICROSERVICE_PORT=8094

		EXPOSE ${MICROSERVICE_PORT}

+3 −0

Original line number	Diff line number	Diff line
		PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG=latest

		MICROSERVICE_NAME=notification-manager
		MICROSERVICE_PORT=8094

+2 −4

Original line number	Diff line number	Diff line
		@@ -2,7 +2,5 @@ version: '3.5'

		services:
		notification-manager:
		ports:
		- target: ${MICROSERVICE_PORT}
		published: ${MICROSERVICE_PORT}
		mode: host
		environment:
		SPRING_PROFILES_ACTIVE: pre

+2 −4