Merge branch 'dev' into 'master' (e3adff5f) · Commits · REDMIC Project / Postgres / PostgreSQL

.gitlab-ci.yml

+9 −8

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ stages:

		docker-build-dev:
		stage: package
		image: redmic/docker-gitlab
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		services:
		@@ -21,7 +21,7 @@ docker-build-dev:

		docker-build-pro:
		stage: package
		image: redmic/docker-gitlab
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		services:
		@@ -59,14 +59,13 @@ container_scanning:
		artifacts:
		paths: [gl-sast-container-report.json]


		deploy-postgresql-dev:
		stage: deploy
		image: redmic/docker-gitlab
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-master
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		@@ -80,16 +79,18 @@ deploy-postgresql-dev:
		environment:
		name: dev
		only:
		- dev
		- branches
		except:
		- master
		when: manual

		deploy-postgresql-pro:
		stage: deploy
		image: redmic/docker-gitlab
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}-slave
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

+0 −1