Merge pull request #116 from linuxserver/site-root

Check config file for site_root as well as env
linuxserver · Jan 24, 2024 · ac68a89 · ac68a89
2 parents c9928ed + d6c2fc0
commit ac68a89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -26,6 +26,7 @@ RUN \
     zlib-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
+    grep \
     mariadb-client \
     postgresql-client \
     python3 \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -26,6 +26,7 @@ RUN \
     zlib-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
+    grep \
     mariadb-client \
     postgresql-client \
     python3 \

diff --git a/root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run b/root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run
@@ -81,9 +81,11 @@ function insert_config() {
     fi
 }
 
-if [[ -z ${SITE_ROOT} ]]; then
+if [[ -z ${SITE_ROOT} ]] && ! grep -q "^SITE_ROOT" /config/local_settings.py; then
     echo "No SITE_ROOT provided, halting init"
     sleep infinity
+elif [[ -z ${SITE_ROOT} ]] && grep -q "^SITE_ROOT" /config/local_settings.py; then
+    SITE_ROOT=$(grep -Po "^SITE_ROOT = \K(.*)" /config/local_settings.py | tr -d '"')
 fi
 
 if [[ ! -f "/config/local_settings.py" ]] || [[ "${REGENERATE_SETTINGS,,}" == "true" ]]; then