From 2accbefbe676b1d6720999dbf6a519d769a502c5 Mon Sep 17 00:00:00 2001 From: FORESTIER Fabien <fabien.forestier@soprasteria.com> Date: Tue, 21 Jan 2020 11:06:44 +0100 Subject: [PATCH] Use the new docker registry 'registry.forge.grandlyon.com' and set package.json version to 1.0.1 --- .gitlab-ci.yml | 5 +++-- docker-compose.yml | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index faa29ed..1a3407a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,8 +56,9 @@ deploy_staging: - 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} - - docker push $CI_REGISTRY/refonte-data/proxy-map-services:${TAG} + - export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/proxies/web-mapping-services + - docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG} + - docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG} - docker-compose --project-name proxy-map-services-${TAG} up -d --force-recreate environment: name: staging diff --git a/docker-compose.yml b/docker-compose.yml index 0c7320b..1dfabb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: proxy-mvt: restart: unless-stopped build: . - image: registry.alpha.grandlyon.com/refonte-data/proxy-map-services:${TAG} + image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/proxies/web-mapping-services:${TAG} ports: - ${PROXY_MVT_BIND_PORT}:9000 environment: diff --git a/package.json b/package.json index abc2971..5678cc9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "proxy-map-services", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { -- GitLab