diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26e21b4746ee4605f802788247ff26c7caecec67..7d943ad49dac130c814e2344cf635a7ea8788f58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build_development: - development script: - export TAG=dev - - export PROXY_MVT_PORT_BIND_PORT=9002 + - export PROXY_MVT_BIND_PORT=9002 - docker-compose build - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker-compose push @@ -22,7 +22,7 @@ build_release: - tags script: - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g') - - export PROXY_MVT_PORT_BIND_PORT=9002 + - export PROXY_MVT_BIND_PORT=9002 - docker-compose build - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker-compose push @@ -33,8 +33,10 @@ deploy_development: - development script: - export TAG=dev - - export PROXY_MVT_PORT_BIND_PORT=9002 + - export PROXY_MVT_BIND_PORT=9003 - export ELASTICSEARCH_URL=https://kong-dev.alpha.grandlyon.com/es-consumer-aware + - export TECHNICAL_ACCOUNT_USERNAME=$TECHNICAL_ACCOUNT_USERNAME + - export TECHNICAL_ACCOUNT_PASSWORD=$TECHNICAL_ACCOUNT_PASSWORD - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker-compose pull - docker-compose --project-name proxy-map-services-${TAG} up -d --force-recreate @@ -48,8 +50,10 @@ deploy_staging: when: manual script: - export TAG=staging - - export PROXY_MVT_PORT_BIND_PORT=9102 + - export PROXY_MVT_BIND_PORT=9103 - export ELASTICSEARCH_URL=https://kong-rec.alpha.grandlyon.com/es-consumer-aware + - export TECHNICAL_ACCOUNT_USERNAME=$TECHNICAL_ACCOUNT_USERNAME + - export TECHNICAL_ACCOUNT_PASSWORD=$TECHNICAL_ACCOUNT_PASSWORD - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - TAG=dev docker-compose pull - docker tag $CI_REGISTRY/refonte-data/proxy-map-services:dev $CI_REGISTRY/refonte-data/proxy-map-services:${TAG} diff --git a/docker-compose.yml b/docker-compose.yml index fa9d28d18fb2ff46bc3d662fef8efdab996cb799..a74a8da97f48a85245513a3214bb53bf362f4492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: build: . image: registry.alpha.grandlyon.com/refonte-data/proxy-map-services:${TAG} ports: - - ${PROXY_MVT_PORT_BIND_PORT}:9000 + - ${PROXY_MVT_BIND_PORT}:9000 environment: - REDIS_SENTINEL_HOST=redis-sentinel-1 - REDIS_SENTINEL_PORT=26379