Commit c30f7ff0 authored by Imre Jonk's avatar Imre Jonk

Merge branch 'ci' into 'master'

Restart Docker container unless stopped

See merge request mddr/api!7
parents 7e207808 48991c56
......@@ -14,7 +14,7 @@ staging:
- 'docker build -t mddr-api:staging .'
- 'docker stop mddr-api-staging || :'
- 'docker rm mddr-api-staging || :'
- 'docker run -d -v mddr-api-staging:/app/uploads -p 172.17.0.1:51001:80 -e PORT=80 -e DEBUG=$DEBUG -e REMINDER_EMAIL_AFTER=$REMINDER_EMAIL_AFTER -e MATOMO_URL=$MATOMO_URL -e MATOMO_SITE_ID=$MATOMO_SITE_ID -e ALLOWED_HOSTS=$ALLOWED_HOSTS -e CACHE_URL=$CACHE_URL -e EMAIL_URL=$EMAIL_URL -e EMAIL_FROM=$EMAIL_FROM -e SECRET_KEY=$SECRET_KEY_STAGING -e DATABASE_URL=$DATABASE_URL_STAGING --name mddr-api-staging mddr-api:staging'
- 'docker run -d --restart unless-stopped -v mddr-api-staging:/app/uploads -p 172.17.0.1:51001:80 -e PORT=80 -e DEBUG=$DEBUG -e REMINDER_EMAIL_AFTER=$REMINDER_EMAIL_AFTER -e MATOMO_URL=$MATOMO_URL -e MATOMO_SITE_ID=$MATOMO_SITE_ID -e ALLOWED_HOSTS=$ALLOWED_HOSTS -e CACHE_URL=$CACHE_URL -e EMAIL_URL=$EMAIL_URL -e EMAIL_FROM=$EMAIL_FROM -e SECRET_KEY=$SECRET_KEY_STAGING -e DATABASE_URL=$DATABASE_URL_STAGING --name mddr-api-staging mddr-api:staging'
- 'docker network connect mddr-staging mddr-api-staging'
production:
......@@ -33,5 +33,5 @@ production:
- 'docker build -t mddr-api .'
- 'docker stop mddr-api || :'
- 'docker rm mddr-api || :'
- 'docker run -d -v mddr-api:/app/uploads -p 172.17.0.1:51002:80 -e PORT=80 -e DEBUG=$DEBUG -e REMINDER_EMAIL_AFTER=$REMINDER_EMAIL_AFTER -e MATOMO_URL=$MATOMO_URL -e MATOMO_SITE_ID=$MATOMO_SITE_ID -e ALLOWED_HOSTS=$ALLOWED_HOSTS -e CACHE_URL=$CACHE_URL -e EMAIL_URL=$EMAIL_URL -e EMAIL_FROM=$EMAIL_FROM -e SECRET_KEY=$SECRET_KEY -e DATABASE_URL=$DATABASE_URL --name mddr-api mddr-api'
- 'docker run -d --restart unless-stopped -v mddr-api:/app/uploads -p 172.17.0.1:51002:80 -e PORT=80 -e DEBUG=$DEBUG -e REMINDER_EMAIL_AFTER=$REMINDER_EMAIL_AFTER -e MATOMO_URL=$MATOMO_URL -e MATOMO_SITE_ID=$MATOMO_SITE_ID -e ALLOWED_HOSTS=$ALLOWED_HOSTS -e CACHE_URL=$CACHE_URL -e EMAIL_URL=$EMAIL_URL -e EMAIL_FROM=$EMAIL_FROM -e SECRET_KEY=$SECRET_KEY -e DATABASE_URL=$DATABASE_URL --name mddr-api mddr-api'
- 'docker network connect mddr mddr-api'
Markdown is supported
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