TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Aarni Halinen
2019-10-09 19:33:45 +03:00
parent bd4551a222 13583bd6ab
commit 135c0309b5
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
production_entrypoint.sh
-1
View File
@@ -4,7 +4,6 @@
export SECRET_KEY=$(cat $SECRET_KEY_FILE)
export TG_BOT_TOKEN=$(cat $TG_BOT_TOKEN_FILE)
export EMAIL_PASSWD=$(cat $EMAIL_PASSWD_FILE)
export DB_NAME=$(cat $DB_NAME_FILE)
export DB_USER=$(cat $DB_USER_FILE)
export DB_PASSWD=$(cat $DB_PASSWD_FILE)
sikweb/settings-sample-prod.py
+1 -1
View File
@@ -41,7 +41,7 @@ TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN')
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': os.getenv('DB_NAME', '<none>'),
'NAME': os.getenv('DB_USER', '<none>'),
'USER': os.getenv('DB_USER', '<none>'),
'PASSWORD': os.getenv('DB_PASSWD', '<none>'),
'HOST': os.getenv('DB_HOST', '127.0.0.1'),
stack-compose.yml
+2 -4
View File
@@ -5,23 +5,22 @@ services:
environment:
- 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
secrets:
- DJANGO_DB_NAME
- DJANGO_DB_USER
- DJANGO_DB_PASSWD
backend:
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
depends_on:
- db
ports:
- 8000:8000
environment:
- 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_PASSWD_FILE=/run/secrets/DJANGO_DB_PASSWD
- DB_HOST=db
@@ -31,7 +30,6 @@ services:
- DJANGO_SECRET_KEY
- DJANGO_TG_BOT_TOKEN
- DJANGO_EMAIL_PASSWD
- DJANGO_DB_NAME
- DJANGO_DB_USER
- DJANGO_DB_PASSWD
secrets: