From 5d225cbda283cc154a7a1398c8f3df4c6a96239d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 23 Jan 2024 22:57:20 +0000 Subject: [PATCH 1/3] Check config file for site_root as well as env --- root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1bc9765..0401424 100755 --- 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,7 +81,7 @@ 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 fi From 735544d5bc47c28d58fd02d148a71cec9f9a6c59 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 24 Jan 2024 13:42:42 +0000 Subject: [PATCH 2/3] If SITE_ROOT env not set but in conf, use that value during init --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index d5ac341..d505bf9 100644 --- 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 index 234998d..3419dc1 100644 --- 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 index 0401424..2df3a5c 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run @@ -84,6 +84,8 @@ function insert_config() { 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 From d6c2fc0b92496939a88945be97d806b97fa7dfed Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 24 Jan 2024 14:02:19 +0000 Subject: [PATCH 3/3] Anchor SITE_ROOT so we don't pick up other instances --- root/etc/s6-overlay/s6-rc.d/init-healthchecks-config/run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 2df3a5c..96c18a5 100755 --- 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,11 +81,11 @@ function insert_config() { fi } -if [[ -z ${SITE_ROOT} ]] && ! grep -q "SITE_ROOT" /config/local_settings.py; 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 '"') +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