Merge branch 'develop'

This commit is contained in:
Aarni Halinen
2019-10-08 01:00:41 +03:00
+1 -2
View File
@@ -4,7 +4,6 @@ services:
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
ports:
- 8000:8000
network_mode: host
environment:
SECRET_KEY: /run/secrets/DJANGO_SECRET_KEY
TG_BOT_TOKEN: /run/secrets/DJANGO_TG_BOT_TOKEN
@@ -13,7 +12,7 @@ services:
DB_NAME: /run/secrets/DJANGO_DB_NAME
DB_USER: /run/secrets/DJANGO_DB_USER
DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
DB_HOST: 127.0.0.1
DB_HOST: 172.17.0.1
DB_PORT: 5432
secrets: