From e939d7a8b3dc05083f7d86a03d55ceecedf15520 Mon Sep 17 00:00:00 2001
From: "Tibor Bossanyi (Freelancer)" <tibor.bossanyi@delti.com>
Date: Sun, 3 Oct 2021 11:13:03 +0200
Subject: [PATCH] BO 1.30.17 env variables for deploy

---
 .env                                                       | 1 +
 Dockerfile                                                 | 7 +------
 aitrainer-cron                                             | 2 +-
 .../aitrainer_backoffice/settings/deploy.py                | 3 ++-
 cron.sh                                                    | 2 ++
 docker-compose.sh                                          | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 cron.sh

diff --git a/.env b/.env
index 4adc110..8304c1e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
 DJANGO_KEY=lkjsdfhlkja9843ö958u9ö34lkjfdlkj
+GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
 MYSQL_ROOT_PASSWORD=andio2009
 MYSQL_USER=aitrainer
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 623d1af..480cec8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,21 +12,16 @@ RUN chmod 0644 /etc/cron.d/aitrainer-cron
 
 # Apply cron job
 RUN crontab /etc/cron.d/aitrainer-cron
- 
-# Create the log file to be able to run tail
-RUN touch /var/log/cron.log
 
 RUN pip3 install uwsgi
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY uwsgi_params /var/www/aitrainer.info/
-COPY .key ./
+
 ENV DJANGO_KEY="9ö2345iőjfdsasd9ukjhlkdf9hg"
 ENV GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
 ENV WORKOUTTEST_SETTING=DEPLOY
 
 ENV PORT=8000
 EXPOSE 8000
-
-CMD ['cron && tail -f /var/log/cron.log']
diff --git a/aitrainer-cron b/aitrainer-cron
index 65a8127..56a6d87 100644
--- a/aitrainer-cron
+++ b/aitrainer-cron
@@ -1 +1 @@
-*/5 * * * * /usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log > 2>&1
+*/5 * * * * /usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log 2>&1
diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py b/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py
index 3941177..1ea0768 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/deploy.py
@@ -9,7 +9,8 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale')]
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ['DJANGO_KEY']
+SECRET_KEY = "lkasdjhklj84ujn3jk4nr5j43njk" #os.environ['DJANGO_KEY']
+GOOGLE_APPLICATION_CREDENTIALS="/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json"
 
 os.environ["WORKOUTTEST_SETTING"] = "DEPLOY"
 
diff --git a/cron.sh b/cron.sh
new file mode 100644
index 0000000..46136d7
--- /dev/null
+++ b/cron.sh
@@ -0,0 +1,2 @@
+export $(cat .env | xargs)
+/usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log 2>&1
\ No newline at end of file
diff --git a/docker-compose.sh b/docker-compose.sh
index dc396e0..d3f12a5 100755
--- a/docker-compose.sh
+++ b/docker-compose.sh
@@ -1,2 +1,2 @@
-export $(cat .key | xargs)
+export $(cat .env | xargs)
 docker-compose up -d