From c6be0e656282a09e5d1763d6a7f2a062990ab0e5 Mon Sep 17 00:00:00 2001
From: Ojakoo <ilari.ojakorpi@gmail.com>
Date: Sat, 6 Aug 2022 10:07:00 +0300
Subject: [PATCH] Add google envs to deploy

---
 .env.sample              | 2 ++
 production_entrypoint.sh | 3 +++
 sikweb/settings.py       | 2 +-
 stack-compose.yml        | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.env.sample b/.env.sample
index f9f3e95..1dcf8b6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,3 +9,5 @@ DB_PASSWD=postgres
 DB_HOST=db
 DB_PORT=5432
 EMAIL_API_KEY=
+GROUP_KEY= 
+GOOGLE_CREDS_JSON='{}'
diff --git a/production_entrypoint.sh b/production_entrypoint.sh
index c58bfac..c39f2f1 100755
--- a/production_entrypoint.sh
+++ b/production_entrypoint.sh
@@ -10,6 +10,9 @@ fi
 if test -f "$DB_PASSWD_FILE"; then
   export DB_PASSWD=$(cat $DB_PASSWD_FILE)
 fi
+if test -f "$GOOGLE_CREDS_JSON"; then
+  export GOOGLE_CREDS_JSON=$(cat $GOOGLE_CRED_JSON_FILE)
+fi
 
 # Collect static files
 echo "Collect static files"
diff --git a/sikweb/settings.py b/sikweb/settings.py
index d635b4b..b18ebcc 100644
--- a/sikweb/settings.py
+++ b/sikweb/settings.py
@@ -82,7 +82,7 @@ DATABASES = {
 
 # Google api settings
 GROUP_KEY = os.getenv("GROUP_KEY", "")
-GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", ""))
+GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", '{}'))
 
 # JWT authentication
 SIMPLE_JWT = {
diff --git a/stack-compose.yml b/stack-compose.yml
index d90f298..15e6bdc 100644
--- a/stack-compose.yml
+++ b/stack-compose.yml
@@ -34,11 +34,13 @@ services:
       - SECRET_KEY_FILE=/run/secrets/BACKEND_SECRET_KEY
       - DB_PASSWD_FILE=/run/secrets/BACKEND_DB_PASSWD
       - EMAIL_API_KEY_FILE=/run/secrets/BACKEND_EMAIL_API_KEY
+      - GOOGLE_CREDS_JSON=/run/secrets/GOOGLE_CREDS_JSON
 
     secrets:
       - BACKEND_SECRET_KEY
       - BACKEND_DB_PASSWD
       - BACKEND_EMAIL_API_KEY
+      - GOOGLE_CREDS_JSON
 secrets:
   BACKEND_SECRET_KEY:
     external: true
@@ -46,3 +48,5 @@ secrets:
     external: true
   BACKEND_EMAIL_API_KEY:
     external: true
+  GOOGLE_CREDS_JSON:
+    EXTERNAL: true