Merge branch 'staging' into dev
This commit is contained in:
commit
66c6ab1eaf
@ -3,9 +3,13 @@ include:
|
|||||||
file: "/templates/docker/build-template.gitlab-ci.yml"
|
file: "/templates/docker/build-template.gitlab-ci.yml"
|
||||||
- project: "devops/pena-continuous-integration"
|
- project: "devops/pena-continuous-integration"
|
||||||
file: "/templates/docker/deploy-template.gitlab-ci.yml"
|
file: "/templates/docker/deploy-template.gitlab-ci.yml"
|
||||||
|
- project: "devops/pena-continuous-integration"
|
||||||
|
file: "/templates/docker/service-discovery.gitlab-ci.yml"
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- deploy
|
- deploy
|
||||||
|
- service-discovery
|
||||||
|
|
||||||
build-app:
|
build-app:
|
||||||
tags:
|
tags:
|
||||||
- frontbuild
|
- frontbuild
|
||||||
@ -30,3 +34,6 @@ deploy-to-prod:
|
|||||||
tags:
|
tags:
|
||||||
- front
|
- front
|
||||||
- prod
|
- prod
|
||||||
|
|
||||||
|
service-discovery:
|
||||||
|
extends: .sd_artefacts_template
|
||||||
|
@ -3,6 +3,9 @@ services:
|
|||||||
respondent:
|
respondent:
|
||||||
container_name: respondent
|
container_name: respondent
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
labels:
|
||||||
|
com.pena.domains: s.hbpn.link
|
||||||
|
com.pena.front_headers: "Access-Control-Allow-Origin $$http_origin always"
|
||||||
image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
|
image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
|
||||||
hostname: respondent
|
hostname: respondent
|
||||||
tty: true
|
tty: true
|
||||||
|
Loading…
Reference in New Issue
Block a user