From 264650b73fdf093b7b68db4fbedc68a714b92b2b Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 27 Aug 2024 16:37:42 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/functions/entrypoint.sh --- .../usr/local/etc/docker/functions/entrypoint.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index 002d505..77ed5ab 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -973,20 +973,24 @@ __initialize_www_root() { __is_htdocs_mounted() { echo "$IMPORT_FROM_GIT" | grep -qE 'https://|http://|git://|ssh://' || unset IMPORT_FROM_GIT if [ -n "$IMPORT_FROM_GIT" ] && [ "$(command -v "git")" ]; then - export WWW_ROOT_DIR="/data/htdocs" + WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}" __is_dir_empty "$WWW_ROOT_DIR" || WWW_ROOT_DIR="/data/wwwroot" echo "Importing project from $IMPORT_FROM_GIT to $WWW_ROOT_DIR" git clone -q "$IMPORT_FROM_GIT" "$WWW_ROOT_DIR" elif [ -d "/app" ]; then - export WWW_ROOT_DIR="/app" + WWW_ROOT_DIR="/app" + elif [ -d "/data/htdocs/www" ]; then + WWW_ROOT_DIR="/data/htdocs/www" + elif [ -d "/data/htdocs/root" ]; then + WWW_ROOT_DIR="/data/htdocs/root" elif [ -d "/data/htdocs" ]; then - export WWW_ROOT_DIR="/data/htdocs" + WWW_ROOT_DIR="/data/htdocs" elif [ -d "/data/wwwroot" ]; then - export WWW_ROOT_DIR="/data/wwwroot" + WWW_ROOT_DIR="/data/wwwroot" else WWW_ROOT_DIR="${ENV_WWW_ROOT_DIR:-$WWW_ROOT_DIR}" - export WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" fi + export WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - __initialize_ssl_certs() {