From 3dabb083a2afbe17838dbcea4afa6ed813b8b8b5 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 21 Jan 2020 13:49:05 +0100
Subject: [PATCH] Use the new docker registry 'registry.forge.grandlyon.com'
and set the package.json version to 3.2.5
---
.gitlab-ci.yml | 5 +++--
docker-compose.yml | 2 +-
package.json | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b863f59..4f6c381 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,8 +73,9 @@ deploy_staging:
- export API_KEY=$REC_API_KEY
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- TAG=dev docker-compose pull
- - docker tag $CI_REGISTRY/refonte-data/legacy-auth-middleware:dev $CI_REGISTRY/refonte-data/legacy-auth-middleware:${TAG}
- - docker push $CI_REGISTRY/refonte-data/legacy-auth-middleware:${TAG}
+ - export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/middlewares/legacy-auth
+ - docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG}
+ - docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG}
- docker-compose --project-name middleware-legacy-auth-${TAG} up -d --force-recreate
environment:
name: staging
diff --git a/docker-compose.yml b/docker-compose.yml
index ff1342d..d768caf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
services:
middleware-legacy-auth:
build: .
- image: registry.alpha.grandlyon.com/refonte-data/legacy-auth-middleware:${TAG}
+ image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/middlewares/legacy-auth:${TAG}
ports:
- ${MIDDLEWARE_LEGACY_SERVICE_BIND_PORT}:3000
environment:
diff --git a/package.json b/package.json
index ca1b044..22710df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "legacy-auth-middleware",
- "version": "3.2.4",
+ "version": "3.2.5",
"description": "",
"author": "",
"license": "MIT",
@@ -77,4 +77,4 @@
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
-}
+}
\ No newline at end of file
--
GitLab