From d88da298f0228afcb1fe1c1ac1e5f52430b30f8c Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Tue, 21 Jan 2020 16:34:32 +0100
Subject: [PATCH] Use the new docker registry 'registry.forge.grandlyon.com'
and update package.json version to 1.1.3
---
.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 8bd911a..74c4b15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,8 +66,9 @@ deploy_staging:
- envsubst < config.template.yml > config.yml
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- TAG=dev docker-compose pull
- - docker tag $CI_REGISTRY/refonte-data/content-indexer:dev $CI_REGISTRY/refonte-data/content-indexer:${TAG}
- - docker push $CI_REGISTRY/refonte-data/content-indexer:${TAG}
+ - export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/indexers/editorial-content
+ - docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG}
+ - docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG}
- docker-compose --project-name content-indexer-${TAG} up -d --force-recreate
environment:
name: staging
diff --git a/docker-compose.yml b/docker-compose.yml
index 02426d2..21c9210 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.0"
services:
api:
build: .
- image: registry.alpha.grandlyon.com/refonte-data/content-indexer:${TAG}
+ image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/indexers/editorial-content:${TAG}
ports:
- ${CONTENT_INDEXER_BIND_PORT}:8000
volumes:
diff --git a/package.json b/package.json
index d393e3a..6c16860 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "content-indexer",
- "version": "1.0.0",
+ "version": "1.1.3",
"description": "",
"main": "lib/jwt_factory.js",
"directories": {
@@ -20,4 +20,4 @@
},
"author": "",
"license": "ISC"
-}
+}
\ No newline at end of file
--
GitLab