From 88d543a54aabb6c59eba3b377710d41cd830acdb Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 3 Feb 2025 15:19:32 -0500 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 Dockerfile .env.scripts rootfs/usr/local/etc/docker/init.d/01-dockerd.sh rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh rootfs/usr/local/etc/docker/init.d/09-buildx.sh rootfs/usr/local/etc/docker/init.d/zz-nginx.sh rootfs/usr/local/share/template-files/config/env/default.sample --- .env.scripts | 2 +- Dockerfile | 2 +- rootfs/usr/local/etc/docker/init.d/01-dockerd.sh | 2 +- rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh | 2 +- rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh | 2 +- rootfs/usr/local/etc/docker/init.d/09-buildx.sh | 2 +- rootfs/usr/local/etc/docker/init.d/zz-nginx.sh | 2 +- rootfs/usr/local/share/template-files/config/env/default.sample | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.scripts b/.env.scripts index e7a59f7..102f2ce 100644 --- a/.env.scripts +++ b/.env.scripts @@ -50,7 +50,7 @@ NODE_VERSION="system" NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" DEFAULT_FILE_DIR="/usr/local/share/template-files" DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" diff --git a/Dockerfile b/Dockerfile index db3815e..b1e9555 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG PHP_SERVER="docker" ARG BUILD_DATE="202410201123" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" -ARG WWW_ROOT_DIR="/usr/share/httpd/default" +ARG WWW_ROOT_DIR="/usr/local/share/httpd/default" ARG DEFAULT_FILE_DIR="/usr/local/share/template-files" ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config" diff --git a/rootfs/usr/local/etc/docker/init.d/01-dockerd.sh b/rootfs/usr/local/etc/docker/init.d/01-dockerd.sh index 8f5f821..711a3b7 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-dockerd.sh +++ b/rootfs/usr/local/etc/docker/init.d/01-dockerd.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/docker" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh b/rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh index d65bf04..cd183b8 100755 --- a/rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-docker-registry.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/docker-registry" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh b/rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh index feb98e4..973dd16 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-docker-compose.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/docker-compose" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/09-buildx.sh b/rootfs/usr/local/etc/docker/init.d/09-buildx.sh index d611b5e..5157c8d 100755 --- a/rootfs/usr/local/etc/docker/init.d/09-buildx.sh +++ b/rootfs/usr/local/etc/docker/init.d/09-buildx.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/buildx" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh index 326e359..8331e1f 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/nginx" # set data directory diff --git a/rootfs/usr/local/share/template-files/config/env/default.sample b/rootfs/usr/local/share/template-files/config/env/default.sample index d481f99..e81257f 100644 --- a/rootfs/usr/local/share/template-files/config/env/default.sample +++ b/rootfs/usr/local/share/template-files/config/env/default.sample @@ -14,7 +14,7 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # directory settings #BACKUP_DIR="${BACKUP_DIR:-/data/backups}" -#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" +#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" #LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" #DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}" #DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"