Commit da747c8e authored by Fabien FORESTIER's avatar Fabien FORESTIER
Browse files

Merge branch 'development' into 'master'

v1.2.6

See merge request !8
parents 897b2245 f032d28e
Pipeline #2567 passed with stage
in 1 minute and 36 seconds
......@@ -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
......@@ -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:
......
{
"name": "service-email",
"version": "1.2.5",
"version": "1.2.6",
"description": "description",
"author": "",
"license": "MIT",
......@@ -71,4 +71,4 @@
"coverageDirectory": "../coverage",
"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