From 9ffec5153752542c158e0f831bb1c3c7e01be3e2 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Tue, 8 Oct 2019 23:16:09 +0300
Subject: [PATCH] Add ENV population to entrypoint.sh

---
 production_entrypoint.sh | 8 ++++++++
 stack-compose.yml        | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/production_entrypoint.sh b/production_entrypoint.sh
index bce7881..4676b15 100755
--- a/production_entrypoint.sh
+++ b/production_entrypoint.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+# Get ENVs from secrets
+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)
+
 # Collect static files
 echo "Collect static files"
 python manage.py collectstatic --noinput
diff --git a/stack-compose.yml b/stack-compose.yml
index abbe45f..e84a605 100644
--- a/stack-compose.yml
+++ b/stack-compose.yml
@@ -25,7 +25,7 @@ services:
       - 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_PASSWD_FILE=/run/secrets/DJANGO_DB_PASSWD
       - DB_HOST=db
       - DB_PORT=5432