Loading .gitlab-ci.yml +10 −2 Original line number Diff line number Diff line Loading @@ -60,8 +60,11 @@ deploy-dev: IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME} script: - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} environment: name: dev url: https://${DEV_PUBLIC_HOSTNAME} Loading @@ -69,6 +72,7 @@ deploy-dev: - branches except: - master when: manual deploy-pro: stage: deploy Loading @@ -80,10 +84,14 @@ deploy-pro: 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} script: - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} environment: name: pro url: https://${PRO_PUBLIC_HOSTNAME} only: - master when: manual No newline at end of file deploy/docker-compose.tmpl.yml +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ services: target: /etc/nginx/certs/privkey.pem - source: cert-dhparam target: /etc/nginx/certs/dhparam.pem healthcheck: test: wget --spider -S -t 3 http://${PUBLIC_HOSTNAME:-localhost} interval: 30s timeout: 10s retries: 3 start_period: 1m deploy: mode: replicated replicas: 1 Loading Loading
.gitlab-ci.yml +10 −2 Original line number Diff line number Diff line Loading @@ -60,8 +60,11 @@ deploy-dev: IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME} script: - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} environment: name: dev url: https://${DEV_PUBLIC_HOSTNAME} Loading @@ -69,6 +72,7 @@ deploy-dev: - branches except: - master when: manual deploy-pro: stage: deploy Loading @@ -80,10 +84,14 @@ deploy-pro: 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} script: - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} environment: name: pro url: https://${PRO_PUBLIC_HOSTNAME} only: - master when: manual No newline at end of file
deploy/docker-compose.tmpl.yml +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ services: target: /etc/nginx/certs/privkey.pem - source: cert-dhparam target: /etc/nginx/certs/dhparam.pem healthcheck: test: wget --spider -S -t 3 http://${PUBLIC_HOSTNAME:-localhost} interval: 30s timeout: 10s retries: 3 start_period: 1m deploy: mode: replicated replicas: 1 Loading