From b4fb254403e974fb64bf82f390ae12aa3542a4e9 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 10 Jul 2022 09:11:43 +0200
Subject: [PATCH] Update run.sh

---
 wger/rootfs/run.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/wger/rootfs/run.sh b/wger/rootfs/run.sh
index 2361def03..eea05ebb2 100644
--- a/wger/rootfs/run.sh
+++ b/wger/rootfs/run.sh
@@ -20,18 +20,20 @@ chmod -R 777 "$LOCATION"
 
 echo "Launch app"
 su -l wger -c "\
-export WORKDIR="/home/wger/src" && \
+export S6_CMD_WAIT_FOR_SERVICES=1 \
+S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+S6_SERVICES_GRACETIME=300000 \
+PATH=/home/wger/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+FROM_EMAIL='wger Workout Manager <wger@example.com>' \
+DJANGO_DB_DATABASE=/data/database.sqlite \
+DEBIAN_FRONTEND=noninteractive \
+LANG=en_US.UTF-8 \
+LANGUAGE=en_US:en \
+LC_ALL=en_US.UTF-8 \
+PYTHONDONTWRITEBYTECODE=1 \
+PYTHONUNBUFFERED=1 \
+WORKDIR="/home/wger/src" && \
 cd /home/wger/src && \
-echo "Starting app" && \
 DOCKER_DIR=./extras/docker/development && \
 if [ -f ~/.bashrc ]; then source ~/.bashrc; fi && \
-export FROM_EMAIL='wger Workout Manager <wger@example.com>' && \
-export DJANGO_DB_DATABASE=/data/database.sqlite && \
-export DEBIAN_FRONTEND=noninteractive && \
-LANG=en_US.UTF-8 && \
-LANGUAGE=en_US:en && \
-LC_ALL=en_US.UTF-8 && \
-PYTHONDONTWRITEBYTECODE=1 && \
-PYTHONUNBUFFERED=1 && \
-PATH=/home/wger/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && \
 /bin/sh /home/wger/entrypoint.sh"