Merge branch 'develop'

This commit is contained in:
Aarni Halinen
2019-10-08 19:57:06 +03:00
+9 -9
View File
@@ -3,9 +3,9 @@ services:
db:
image: postgres
environment:
- POSTGRES_USER=/run/secrets/DJANGO_DB_USER
- POSTGRES_PASSWORD=/run/secrets/DJANGO_DB_PASSWD
- POSTGRES_DB=/run/secrets/DJANGO_DB_NAME
- POSTGRES_USER_FILE=/run/secrets/DJANGO_DB_USER
- POSTGRES_PASSWORD_FILE=/run/secrets/DJANGO_DB_PASSWD
- POSTGRES_DB_FILE=/run/secrets/DJANGO_DB_NAME
ports:
- 5432:5432
volumes:
@@ -20,12 +20,12 @@ services:
ports:
- 8000:8000
environment:
- SECRET_KEY=/run/secrets/DJANGO_SECRET_KEY
- TG_BOT_TOKEN=/run/secrets/DJANGO_TG_BOT_TOKEN
- EMAIL_PASSWD=/run/secrets/DJANGO_EMAIL_PASSWD
- DB_NAME=/run/secrets/DJANGO_DB_NAME
- DB_USER=/run/secrets/DJANGO_DB_USER
- DB_PASSWORD=/run/secrets/DJANGO_DB_PASSWD
- SECRET_KEY_FILE=/run/secrets/DJANGO_SECRET_KEY
- TG_BOT_TOKEN_FILE=/run/secrets/DJANGO_TG_BOT_TOKEN
- EMAIL_PASSWD_FILE=/run/secrets/DJANGO_EMAIL_PASSWD
- DB_NAME_FILE=/run/secrets/DJANGO_DB_NAME
- DB_USER_FILE=/run/secrets/DJANGO_DB_USER
- DB_PASSWORD_FILE=/run/secrets/DJANGO_DB_PASSWD
- DB_HOST=db
- DB_PORT=5432