From 11d7f7b888f0c6c4e535c93871a7171c3fd7d8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <danilo@feastr.de>
Date: Fri, 22 Jan 2021 21:08:34 +0100
Subject: [PATCH] Allow preset env variable for django secret

The source command fails if /run/secrets/django does not exist. This is however not important if DJANGO_SECRET_KEY is already set. This is checked in the next step
---
 server/docker/entrypoint          | 2 +-
 server/docker/entrypoint-db-setup | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/docker/entrypoint b/server/docker/entrypoint
index 732209a9d..2932f2bf4 100755
--- a/server/docker/entrypoint
+++ b/server/docker/entrypoint
@@ -3,7 +3,7 @@
 set -e
 
 # Set DJANGO_SECRET_KEY variable
-source /run/secrets/django
+source /run/secrets/django || true
 [[ -n "$DJANGO_SECRET_KEY" ]] || {
   echo "ERROR: Django secret key undefined!  Cannot continue."
   sleep 5
diff --git a/server/docker/entrypoint-db-setup b/server/docker/entrypoint-db-setup
index aad4a8d14..6915adc7a 100755
--- a/server/docker/entrypoint-db-setup
+++ b/server/docker/entrypoint-db-setup
@@ -16,7 +16,7 @@ EOF
 }
 
 # Set DJANGO_SECRET_KEY variable
-source /run/secrets/django
+source /run/secrets/django || true
 [[ -n "$DJANGO_SECRET_KEY" ]] || {
   echo "ERROR: Django secret key undefined!  Cannot continue."
   sleep 5