diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69dc60a..25166e2 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 @@ -26,6 +29,8 @@ deploy-to-prod: - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH" tags: - prod - after_script: - - ls extends: .deploy_template + +service-discovery: + extends: .sd_artefacts_template + diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d7ba9d..bbd0125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -#v1.0.0 +#v1.0.1 INTERNAL: - Добавлено версионирование модели данных. На данный момент модель под версией 1 + FIX: - При пустой корзине во время оплаты(/cart/pay) больше не будет возвращаться 500, а будет возвращаться 406 diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 726a9d2..c603608 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -2,10 +2,12 @@ version: "3.3" services: customer-app-stagingv1.0.1: - hostname: customer-service-stagingv1.0.1 - container_name: customer-service-stagingv1.0.1 + hostname: customerv1.0.1 + container_name: customerv1.0.1 image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID tty: true + labels: + com.pena.allowed_headers: content-type,authorization,response-type environment: - CLIENT_HTTP_HOST=0.0.0.0 - CLIENT_HTTP_PORT=8065