Merge branch 'dev' into 'master' (80d3760e) · Commits · REDMIC Project / GitLab CI templates

_deployment.yml

+8 −5

Original line number	Diff line number	Diff line
		variables:
		DEPLOY_BASE_JOB: .deploy
		DEPLOY_DEVELOPMENT_BASE_JOB: .deploy-development
		DEPLOY_PRODUCTION_BASE_JOB: .deploy-production
		DEPLOYMENT_IMAGE: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}
		STACK: stack
		REGISTRY_URL: ${CI_REGISTRY}
		@@ -21,7 +24,7 @@ variables:
		when: manual

		.deploy-development:
		extends: .deploy
		extends: ${DEPLOY_BASE_JOB}
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		@@ -30,7 +33,7 @@ variables:
		name: dev

		.deploy-production:
		extends: .deploy
		extends: ${DEPLOY_BASE_JOB}
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		@@ -39,7 +42,7 @@ variables:
		name: pro

		.deploy-support-branch-development:
		extends: .deploy-development
		extends: ${DEPLOY_DEVELOPMENT_BASE_JOB}
		only:
		- branches
		except:
		@@ -47,14 +50,14 @@ variables:
		- schedules

		.deploy-stable-branch-development:
		extends: .deploy-development
		extends: ${DEPLOY_DEVELOPMENT_BASE_JOB}
		only:
		- master
		except:
		- schedules

		.deploy-stable-branch-production:
		extends: .deploy-production
		extends: ${DEPLOY_PRODUCTION_BASE_JOB}
		only:
		- master
		except:

+1 −2

Original line number	Diff line number	Diff line
		variables:
		MAINTENANCE_IMAGE: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}
		STACK: stack
		SERVICE_TO_RUN: ${CI_PROJECT_NAME}
		REGISTRY_URL: ${CI_REGISTRY}
		REGISTRY_USER: ${CI_DEPLOY_USER}
		REGISTRY_PASS: ${CI_DEPLOY_PASSWORD}
		@@ -10,7 +9,7 @@ variables:
		stage: maintenance
		image: ${MAINTENANCE_IMAGE}
		variables:
		SERVICE: ${STACK}_${SERVICE_TO_RUN}
		SERVICE: ${STACK}_${CI_PROJECT_NAME}
		script: relaunch.sh
		only:
		- schedules