From 5f4cbce11cc317fc11d253e6be3880f0830f1abd Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 21 Jan 2020 15:50:59 +0100
Subject: [PATCH] Use the new docker registry 'registry.forge.grandlyon.com'
---
.gitlab-ci.yml | 5 +++--
docker-compose.yml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1519be..6055f88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,9 @@ deploy_staging:
- export CSV_CATALOG_DOWNLOAD_SERVICE_CONFIG_FILE_PATH=${PWD}/config.yaml
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- TAG=dev docker-compose pull
- - docker tag $CI_REGISTRY/refonte-data/service-catalog:dev $CI_REGISTRY/refonte-data/service-catalog:${TAG}
- - docker push $CI_REGISTRY/refonte-data/service-catalog:${TAG}
+ - export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/csv-catalog-downloader
+ - docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG}
+ - docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG}
- docker-compose --project-name csv-catalog-download-service-${TAG} up -d --force-recreate
environment:
name: staging
diff --git a/docker-compose.yml b/docker-compose.yml
index eabb880..fe2fb9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.0"
services:
csv-catalog-download:
build: .
- image: registry.alpha.grandlyon.com/refonte-data/service-catalog:${TAG}
+ image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/csv-catalog-downloader:${TAG}
ports:
- ${CSV_CATALOG_DOWNLOAD_SERVICE_BIND_PORT}:8000
volumes:
--
GitLab