From a7b1be31207d55360a0851f90780ff6562cfb000 Mon Sep 17 00:00:00 2001 From: FORESTIER Fabien <fabien.forestier@soprasteria.com> Date: Fri, 17 Jan 2020 17:17:53 +0100 Subject: [PATCH] Use the new registry host '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 2280fe0..bcf904b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,8 +59,9 @@ deploy_staging: - export NO_REPLY_MAIL_ADDRESS=no-reply@erasme.org - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - TAG=dev docker-compose pull - - docker tag $CI_REGISTRY/refonte-data/service-email:dev $CI_REGISTRY/refonte-data/service-email:${TAG} - - docker push $CI_REGISTRY/refonte-data/service-email:${TAG} + - export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/mailer + - docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG} + - docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG} - docker-compose --project-name service-email-${TAG} up -d --force-recreate environment: name: staging \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index afa59fd..761adf7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: mail-service: build: . - image: registry.alpha.grandlyon.com/refonte-data/service-email:${TAG} + image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/mailer:${TAG} ports: - ${MAIL_SERVICE_BIND_PORT}:3000 environment: -- GitLab