Commit 8f2314eb authored by Fabien FORESTIER's avatar Fabien FORESTIER
Browse files

Merge branch 'development' into 'master'

v3.2.5

See merge request !8
parents 49192055 3dabb083
Pipeline #3192 passed with stage
in 2 minutes and 40 seconds
...@@ -73,8 +73,9 @@ deploy_staging: ...@@ -73,8 +73,9 @@ deploy_staging:
- export API_KEY=$REC_API_KEY - export API_KEY=$REC_API_KEY
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- TAG=dev docker-compose pull - TAG=dev docker-compose pull
- docker tag $CI_REGISTRY/refonte-data/legacy-auth-middleware:dev $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 push $CI_REGISTRY/refonte-data/legacy-auth-middleware:${TAG} - 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 - docker-compose --project-name middleware-legacy-auth-${TAG} up -d --force-recreate
environment: environment:
name: staging name: staging
......
...@@ -3,7 +3,7 @@ version: '3.1' ...@@ -3,7 +3,7 @@ version: '3.1'
services: services:
middleware-legacy-auth: middleware-legacy-auth:
build: . 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: ports:
- ${MIDDLEWARE_LEGACY_SERVICE_BIND_PORT}:3000 - ${MIDDLEWARE_LEGACY_SERVICE_BIND_PORT}:3000
environment: environment:
......
{ {
"name": "legacy-auth-middleware", "name": "legacy-auth-middleware",
"version": "3.2.4", "version": "3.2.5",
"description": "", "description": "",
"author": "", "author": "",
"license": "MIT", "license": "MIT",
...@@ -77,4 +77,4 @@ ...@@ -77,4 +77,4 @@
"coverageDirectory": "../coverage", "coverageDirectory": "../coverage",
"testEnvironment": "node" "testEnvironment": "node"
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment