From 76edc86825b1fc6fba3d879cfd894e2a30e633aa Mon Sep 17 00:00:00 2001 From: skeris Date: Fri, 6 Sep 2024 22:51:16 +0300 Subject: [PATCH 1/2] enable service discovery artefacts creation --- .gitlab-ci.yml | 7 +++++++ deployments/staging/docker-compose.yaml | 3 +++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2355dbd..b4700dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,13 @@ include: file: "/templates/docker/build-template.gitlab-ci.yml" - project: "devops/pena-continuous-integration" file: "/templates/docker/deploy-template.gitlab-ci.yml" + - project: "devops/pena-continuous-integration" + file: "/templates/docker/service-discovery.gitlab-ci.yml" stages: - build - deploy + - service-discovery + build-app: tags: - frontbuild @@ -30,3 +34,6 @@ deploy-to-prod: tags: - front - prod + +service-discovery: + extends: .sd_artefacts_template diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 202dea9..4e89603 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -3,6 +3,9 @@ services: respondent: container_name: respondent 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 hostname: respondent tty: true From 4d951f9e9480d621c09569f3dd15242a15bd9310 Mon Sep 17 00:00:00 2001 From: skeris Date: Fri, 13 Sep 2024 16:33:39 +0300 Subject: [PATCH 2/2] escape $ til freeday --- deployments/staging/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 4e89603..e576e61 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -5,7 +5,7 @@ services: restart: unless-stopped labels: com.pena.domains: s.hbpn.link - com.pena.front_headers: "Access-Control-Allow-Origin $http_origin always" + com.pena.front_headers: "Access-Control-Allow-Origin $$http_origin always" image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID hostname: respondent tty: true