Transforma despliegue de entorno dev a Swarm (53017d44) · Commits · REDMIC Project / Static pages

.gitlab-ci.yml

+16 −33

Original line number	Diff line number	Diff line
		@@ -3,13 +3,16 @@ stages:
		- test-package
		- deploy

		docker-build-commit-non-master-branches:
		stage: package
		image: docker:stable

		variables:
		DOCKER_DRIVER: overlay2

		services:
		- docker:dind

		docker-build-commit-non-master-branches:
		stage: package
		only:
		- branches
		except:
		@@ -21,13 +24,9 @@ docker-build-commit-non-master-branches:

		docker-build-commit-master-branch:
		stage: package
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG: latest
		services:
		- docker:dind
		only:
		- master
		script:
		@@ -37,11 +36,6 @@ docker-build-commit-master-branch:

		docker-tag-already-built-image:
		stage: package
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		services:
		- docker:dind
		only:
		- tags
		script:
		@@ -51,12 +45,7 @@ docker-tag-already-built-image:

		container-scanning:
		stage: test-package
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		allow_failure: true
		services:
		- docker:stable-dind
		only:
		- branches
		script:
		@@ -79,18 +68,17 @@ deploy-dev:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: ${CI_PROJECT_NAME}
		SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		EXTERNAL_PORT=${EXTERNAL_PORT}
		EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		only:
		@@ -101,18 +89,17 @@ deploy-supporting-branch:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: ${CI_PROJECT_NAME}
		SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		EXTERNAL_PORT=${EXTERNAL_PORT}
		EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		only:
		@@ -126,17 +113,13 @@ deploy-pro:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		STATUS_CHECK_DELAY: '40'
		STACK: ${CI_PROJECT_NAME}
		SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

.env→deploy/.env

+0 −0

File moved.

View file

deploy/docker-compose.dev.yml

0 → 100644

+28 −0

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

		services:
		static-pages:
		ports:
		- target: ${INTERNAL_PORT}
		published: ${EXTERNAL_PORT}
		mode: host
		deploy:
		mode: global
		labels:
		traefik.docker.network: traefik-net
		traefik.static.port: "${INTERNAL_PORT}"
		traefik.static.frontend.rule: Host:${STATIC_SUBDOMAIN}.${PUBLIC_HOSTNAME}
		traefik.static.backend: static-pages
		traefik.web-error-handle.port: "${INTERNAL_PORT}"
		traefik.web-error-handle.frontend.rule: Host:${PUBLIC_HOSTNAME};ReplacePathRegex:^.*?(resources/[^/]+\\.\\w+)?$$ /maintenance/$$1
		traefik.web-error-handle.frontend.priority: "1"
		traefik.web-error-handle.backend: static-pages
		restart_policy:
		delay: 30s
		window: 1m
		resources:
		limits:
		cpus: '0.1'
		memory: 64M
		reservations:
		memory: 52M

docker-compose.prod.yml→deploy/docker-compose.prod.yml

+3 −10

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@ version: '3.5'

		services:
		static-pages:
		networks:
		- traefik-net
		deploy:
		mode: global
		labels:
		@@ -16,16 +14,11 @@ services:
		traefik.web-error-handle.frontend.priority: "1"
		traefik.web-error-handle.backend: static-pages
		restart_policy:
		condition: on-failure
		delay: 30s
		window: 2m
		window: 1m
		resources:
		limits:
		cpus: '0.1'
		memory: 50M
		memory: 64M
		reservations:
		memory: 10M

		networks:
		traefik-net:
		external: true
		memory: 52M

docker-compose.tmpl.yml→deploy/docker-compose.tmpl.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ services:
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		networks:
		- redmic-net
		- traefik-net
		healthcheck:
		test: wget --spider -S -t 3 http://localhost
		interval: 30s
		@@ -15,3 +16,5 @@ services:
		networks:
		redmic-net:
		external: true
		traefik-net:
		external: true