From 6c25740a75e9710ea3216eef511efcae2aac4521 Mon Sep 17 00:00:00 2001 From: skeris Date: Thu, 5 Sep 2024 20:00:16 +0300 Subject: [PATCH] enable service discovery artefacts creation --- .gitlab-ci.yml | 6 ++++++ deployments/staging/docker-compose.yaml | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edbeabd..f68f333 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,13 @@ include: file: "/templates/docker/deploy-template.gitlab-ci.yml" - project: "devops/pena-continuous-integration" file: "/templates/docker/golint.gitlab-ci.yml" + - project: "devops/pena-continuous-integration" + file: "/templates/docker/service-discovery.gitlab-ci.yml" stages: - lint - build - deploy + - service-discovery lint: extends: .golint_template @@ -30,3 +33,6 @@ deploy-to-prod: tags: - prod extends: .deploy_template + +service-discovery: + extends: .sd_artefacts_template diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 2ad2991..0da5659 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -7,11 +7,11 @@ services: hostname: feedback networks: - default + labels: + com.pena.allowed_headers: content-type,response-type image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID ports: - 10.8.0.6:8006:80 - labels: - com.pena.domains: services.pena.digital environment: - HTTP_ADDRESS=:80 - HTTP_RATE_LIMIT=30s @@ -21,17 +21,17 @@ services: - TRASH_LOG_HOST=10.8.0.15:7113 - MODULE_LOGGER=feedback manualquiz: - container_name: manualquiz + container_name: requestquiz restart: unless-stopped tty: true - hostname: manualquiz + hostname: requestquiz networks: - default image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID ports: - 10.8.0.6:8007:80 labels: - com.pena.domains: squiz.pena.digital,shub.pena.digital + com.pena.allowed_headers: content-type,response-type environment: - HTTP_ADDRESS=:80 - HTTP_RATE_LIMIT=30s