diff --git a/rootfs/usr/local/etc/docker/init.d/00-named.sh b/rootfs/usr/local/etc/docker/init.d/00-named.sh index 319a951..5fac9b4 100755 --- a/rootfs/usr/local/etc/docker/init.d/00-named.sh +++ b/rootfs/usr/local/etc/docker/init.d/00-named.sh @@ -567,10 +567,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; } [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" [ -n "$RUNAS_USER" ] || RUNAS_USER="root" [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER" [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}" +[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Database env if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then diff --git a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh index 28904ef..db197e4 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh @@ -467,10 +467,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; } [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" [ -n "$RUNAS_USER" ] || RUNAS_USER="root" [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER" [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}" +[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Database env if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then diff --git a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh index 83a16f3..a46e02f 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh @@ -467,10 +467,10 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; } [ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" [ -n "$RUNAS_USER" ] || RUNAS_USER="root" [ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER" [ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}" +[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Database env if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then