From de4d00b50413239eda4611ea3af5d5f8ebb90649 Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 8 Jul 2026 20:26:23 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20org=20URLs,=20dead=20templ?= =?UTF-8?q?ate-file=20vars,=20and=20Dockerfile.3.14/.3.15=20build=20bug=20?= =?UTF-8?q?=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ran the full AI.md sync runbook (gen-dockerfile --update, rootfs regeneration, dead-variable audit) to bring generated files back in line with the template and fix a build-breaking bug. - .env.scripts, .env.scripts.3.14-3.23, .env.scripts.edge, .env.scripts.testing: fixed ENV_GIT_REPO_URL from the wrong "casjaysdevdocker" org to the correct "dockersrc" GitHub org; corrected License header from stale MIT to WTFPL (matches LICENSE.md); removed deprecated DEFAULT_FILE_DIR/DEFAULT_DATA_DIR/ DEFAULT_CONF_DIR/DEFAULT_TEMPLATE_DIR vars; refreshed version/date stamps. - Dockerfile.3.14-3.22, Dockerfile.edge: fixed LABEL org.opencontainers.image.url and .source to point at docker.io/casjaysdev/alpine (was hub.docker.com, registry org is casjaysdev per explicit instruction; GitHub org is dockersrc). - Dockerfile.3.14: restored the three missing ARG DEFAULT_DATA_DIR/CONF_DIR/ TEMPLATE_DIR declarations (global + both build-stage re-declarations) that had been dropped, leaving the "RUN mkdir -p ..." step referencing undefined ARGs. With SHELL_OPTS="set -e -o pipefail" this caused `mkdir -p ""` to fail the build outright. Verified fixed with a full `docker build` of this file. - Dockerfile.3.15: same bug — was missing all three ARG DEFAULT_* blocks (global declarations plus one of the two build-stage re-declarations). Restored to match the structure of Dockerfile.3.16-3.22/edge exactly. Verified fixed with a full `docker build` of this file. - rootfs/root/docker/setup/00-init.sh through 07-cleanup.sh: regenerated from the current template — license header fix, `set -o pipefail` -> `set -eo pipefail`, and 00-init.sh/03-files.sh no longer reference the removed template-files data/config/defaults directories. - rootfs/usr/local/bin/entrypoint.sh: regenerated from the current template — license/date stamp refresh, `return` -> `return 0`, `grep` calls hardened with `--` before pattern arguments, and MTA setup no longer force-succeeds with `|| true`. Confirmed via `hadolint` (no new errors, only pre-existing DL3007 latest-tag warnings shared across the whole Dockerfile fleet) and `sh -n`/`bash -n` on every touched script (clean). No init.d scripts exist in this repo (Step 4 of AI.md's runbook not applicable). rootfs directory layout already standard (Step 7 not applicable — no non-standard top-level dirs found). Dockerfile.3.14 Dockerfile.3.15 Dockerfile.3.16 Dockerfile.3.17 Dockerfile.3.18 Dockerfile.3.19 Dockerfile.3.20 Dockerfile.3.21 Dockerfile.3.22 Dockerfile.edge .env.scripts .env.scripts.3.14 .env.scripts.3.15 .env.scripts.3.16 .env.scripts.3.17 .env.scripts.3.18 .env.scripts.3.19 .env.scripts.3.20 .env.scripts.3.21 .env.scripts.3.22 .env.scripts.3.23 .env.scripts.edge .env.scripts.testing rootfs/root/docker/setup/00-init.sh rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/02-packages.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/04-users.sh rootfs/root/docker/setup/05-custom.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/usr/local/bin/entrypoint.sh --- .env.scripts | 12 ++++------ .env.scripts.3.14 | 10 +++----- .env.scripts.3.15 | 10 +++----- .env.scripts.3.16 | 10 +++----- .env.scripts.3.17 | 10 +++----- .env.scripts.3.18 | 10 +++----- .env.scripts.3.19 | 10 +++----- .env.scripts.3.20 | 10 +++----- .env.scripts.3.21 | 10 +++----- .env.scripts.3.22 | 10 +++----- .env.scripts.3.23 | 12 ++++------ .env.scripts.edge | 10 +++----- .env.scripts.testing | 10 ++++---- Dockerfile.3.14 | 16 +++++++++++-- Dockerfile.3.15 | 12 ++++++++-- Dockerfile.3.16 | 4 ++-- Dockerfile.3.17 | 4 ++-- Dockerfile.3.18 | 4 ++-- Dockerfile.3.19 | 4 ++-- Dockerfile.3.20 | 4 ++-- Dockerfile.3.21 | 4 ++-- Dockerfile.3.22 | 4 ++-- Dockerfile.edge | 4 ++-- rootfs/root/docker/setup/00-init.sh | 12 ++++------ rootfs/root/docker/setup/01-system.sh | 8 +++---- rootfs/root/docker/setup/02-packages.sh | 8 +++---- rootfs/root/docker/setup/03-files.sh | 32 ++++++++++--------------- rootfs/root/docker/setup/04-users.sh | 8 +++---- rootfs/root/docker/setup/05-custom.sh | 8 +++---- rootfs/root/docker/setup/06-post.sh | 8 +++---- rootfs/root/docker/setup/07-cleanup.sh | 8 +++---- rootfs/usr/local/bin/entrypoint.sh | 18 +++++++------- 32 files changed, 134 insertions(+), 170 deletions(-) diff --git a/.env.scripts b/.env.scripts index d6d6a45..1546f67 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:20 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:40 PM EDT 2026 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -37,7 +37,7 @@ ENV_MAINTAINER="CasjaysDev " # - - - - - - - - - - - - - - - - - - - - - - - - - # Repository URLs (Full URLs) # ENV_GIT_REPO_URL: Complete Git repository URL for source code -ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/alpine" +ENV_GIT_REPO_URL="https://github.com/dockersrc/alpine" # ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io) ENV_REGISTRY_URL="https://docker.io" # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.14 b/.env.scripts.3.14 index 8ef5ccd..334522f 100644 --- a/.env.scripts.3.14 +++ b/.env.scripts.3.14 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:30 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:43 PM EDT 2026 # @@File : .env.scripts.3.14 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.15 b/.env.scripts.3.15 index 48f7591..4977bfc 100644 --- a/.env.scripts.3.15 +++ b/.env.scripts.3.15 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:38 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:45 PM EDT 2026 # @@File : .env.scripts.3.15 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.16 b/.env.scripts.3.16 index b266fb0..cd2e73e 100644 --- a/.env.scripts.3.16 +++ b/.env.scripts.3.16 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:45 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:47 PM EDT 2026 # @@File : .env.scripts.3.16 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.17 b/.env.scripts.3.17 index b006f98..208e83a 100644 --- a/.env.scripts.3.17 +++ b/.env.scripts.3.17 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:51 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:50 PM EDT 2026 # @@File : .env.scripts.3.17 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.18 b/.env.scripts.3.18 index 8fc8d9e..6718ad7 100644 --- a/.env.scripts.3.18 +++ b/.env.scripts.3.18 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:56 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:52 PM EDT 2026 # @@File : .env.scripts.3.18 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.19 b/.env.scripts.3.19 index adf92cd..66616e1 100644 --- a/.env.scripts.3.19 +++ b/.env.scripts.3.19 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:03 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:55 PM EDT 2026 # @@File : .env.scripts.3.19 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.20 b/.env.scripts.3.20 index f621685..06e82f8 100644 --- a/.env.scripts.3.20 +++ b/.env.scripts.3.20 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081834-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:16 PM EDT 2026 +# @@Created : Wed Jul 8 06:34:58 PM EDT 2026 # @@File : .env.scripts.3.20 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.21 b/.env.scripts.3.21 index 2dadae5..eee7659 100644 --- a/.env.scripts.3.21 +++ b/.env.scripts.3.21 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081835-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:28 PM EDT 2026 +# @@Created : Wed Jul 8 06:35:05 PM EDT 2026 # @@File : .env.scripts.3.21 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.22 b/.env.scripts.3.22 index 00fc525..9e1e6be 100644 --- a/.env.scripts.3.22 +++ b/.env.scripts.3.22 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081835-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:37 PM EDT 2026 +# @@Created : Wed Jul 8 06:35:12 PM EDT 2026 # @@File : .env.scripts.3.22 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.3.23 b/.env.scripts.3.23 index cba63cb..9be40f3 100644 --- a/.env.scripts.3.23 +++ b/.env.scripts.3.23 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081835-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:46 PM EDT 2026 +# @@Created : Wed Jul 8 06:35:17 PM EDT 2026 # @@File : .env.scripts.3.23 # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -37,7 +37,7 @@ ENV_MAINTAINER="CasjaysDev " # - - - - - - - - - - - - - - - - - - - - - - - - - # Repository URLs (Full URLs) # ENV_GIT_REPO_URL: Complete Git repository URL for source code -ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/alpine" +ENV_GIT_REPO_URL="https://github.com/dockersrc/alpine" # ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io) ENV_REGISTRY_URL="https://docker.io" # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.edge b/.env.scripts.edge index c2a2103..6fc990d 100644 --- a/.env.scripts.edge +++ b/.env.scripts.edge @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242111-git +##@Version : 202607081835-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:11:52 PM EDT 2026 +# @@Created : Wed Jul 8 06:35:20 PM EDT 2026 # @@File : .env.scripts.edge # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -72,10 +72,6 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories 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" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.testing b/.env.scripts.testing index e8ab517..fa92057 100644 --- a/.env.scripts.testing +++ b/.env.scripts.testing @@ -1,11 +1,11 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242110-git +##@Version : 202607081835-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 09:10:20 PM EDT 2026 -# @@File : .env.scripts +# @@Created : Wed Jul 8 06:35:24 PM EDT 2026 +# @@File : .env.scripts.testing # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript # @@TODO : Refactor code @@ -37,7 +37,7 @@ ENV_MAINTAINER="CasjaysDev " # - - - - - - - - - - - - - - - - - - - - - - - - - # Repository URLs (Full URLs) # ENV_GIT_REPO_URL: Complete Git repository URL for source code -ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/alpine" +ENV_GIT_REPO_URL="https://github.com/dockersrc/alpine" # ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io) ENV_REGISTRY_URL="https://docker.io" # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile.3.14 b/Dockerfile.3.14 index 0dd1852..efbd3b9 100644 --- a/Dockerfile.3.14 +++ b/Dockerfile.3.14 @@ -6,6 +6,10 @@ ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" 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" +ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" ARG USER="root" ARG SHELL_OPTS="set -e -o pipefail" @@ -38,6 +42,10 @@ ARG EXPOSE_PORTS ARG BUILD_VERSION ARG IMAGE_VERSION ARG WWW_ROOT_DIR +ARG DEFAULT_FILE_DIR +ARG DEFAULT_DATA_DIR +ARG DEFAULT_CONF_DIR +ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG NODE_VERSION ARG NODE_MANAGER @@ -191,6 +199,10 @@ ARG EXPOSE_PORTS ARG BUILD_VERSION ARG IMAGE_VERSION ARG WWW_ROOT_DIR +ARG DEFAULT_FILE_DIR +ARG DEFAULT_DATA_DIR +ARG DEFAULT_CONF_DIR +ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG NODE_VERSION ARG NODE_MANAGER @@ -212,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.15 b/Dockerfile.3.15 index c45e927..7a7e408 100644 --- a/Dockerfile.3.15 +++ b/Dockerfile.3.15 @@ -6,6 +6,10 @@ ARG BUILD_DATE="202408111050" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" 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" +ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" ARG USER="root" ARG SHELL_OPTS="set -e -o pipefail" @@ -38,6 +42,10 @@ ARG EXPOSE_PORTS ARG BUILD_VERSION ARG IMAGE_VERSION ARG WWW_ROOT_DIR +ARG DEFAULT_FILE_DIR +ARG DEFAULT_DATA_DIR +ARG DEFAULT_CONF_DIR +ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG NODE_VERSION ARG NODE_MANAGER @@ -216,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.16 b/Dockerfile.3.16 index 6d26d8d..f082cca 100644 --- a/Dockerfile.3.16 +++ b/Dockerfile.3.16 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.17 b/Dockerfile.3.17 index 54fa319..bc443e2 100644 --- a/Dockerfile.3.17 +++ b/Dockerfile.3.17 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.18 b/Dockerfile.3.18 index 3f31b30..e52ec80 100644 --- a/Dockerfile.3.18 +++ b/Dockerfile.3.18 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.19 b/Dockerfile.3.19 index e2baa3d..664cdbf 100644 --- a/Dockerfile.3.19 +++ b/Dockerfile.3.19 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.20 b/Dockerfile.3.20 index 2d9b862..87ef75f 100644 --- a/Dockerfile.3.20 +++ b/Dockerfile.3.20 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.21 b/Dockerfile.3.21 index 340a314..e1d222e 100644 --- a/Dockerfile.3.21 +++ b/Dockerfile.3.21 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.3.22 b/Dockerfile.3.22 index e5f2ec2..f515b6c 100644 --- a/Dockerfile.3.22 +++ b/Dockerfile.3.22 @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/Dockerfile.edge b/Dockerfile.edge index 7cf964b..3559330 100644 --- a/Dockerfile.edge +++ b/Dockerfile.edge @@ -224,8 +224,8 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine" -LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${BUILD_VERSION}" LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine" diff --git a/rootfs/root/docker/setup/00-init.sh b/rootfs/root/docker/setup/00-init.sh index fe7485b..b80160f 100755 --- a/rootfs/root/docker/setup/00-init.sh +++ b/rootfs/root/docker/setup/00-init.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:00 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:22 PM EDT 2026 # @@File : 00-init.sh # @@Description : script to run init # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables @@ -28,9 +28,7 @@ exitCode=0 # - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions -if [ -d "/usr/local/share/template-files/data" ]; then rm -Rf "/usr/local/share/template-files/data"/*; fi -if [ -d "/usr/local/share/template-files/config" ]; then rm -Rf "/usr/local/share/template-files/config"/*; fi -if [ -d "/usr/local/share/template-files/defaults" ]; then rm -Rf "/usr/local/share/template-files/defaults"/*; fi + # - - - - - - - - - - - - - - - - - - - - - - - - - # Main script diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh index 3e44ad8..b0737db 100755 --- a/rootfs/root/docker/setup/01-system.sh +++ b/rootfs/root/docker/setup/01-system.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:22 PM EDT 2026 # @@File : 01-system.sh # @@Description : script to run system # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index 807fed2..0357f3c 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242139-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:23 PM EDT 2026 # @@File : 02-packages.sh # @@Description : script to run packages # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index 74f2e1e..3ebf0f2 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:23 PM EDT 2026 # @@File : 03-files.sh # @@Description : script to run files # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables @@ -61,29 +61,23 @@ if [ -d "/tmp/etc" ]; then if [ -d "$config" ]; then mkdir -p "/etc/$name" cp -Rf "$config/." "/etc/$name/" - mkdir -p "/usr/local/share/template-files/config/$name" - cp -Rf "$config/." "/usr/local/share/template-files/config/$name/" else cp -Rf "$config" "/etc/$name" - cp -Rf "$config" "/usr/local/share/template-files/config/$name" fi done fi unset config -if [ -d "/tmp/data" ]; then - for data in "/tmp/data"/*; do - [ -e "$data" ] || continue - name="${data##*/}" - echo "Installing $data to /usr/local/share/template-files/data" - if [ -d "$data" ]; then - mkdir -p "/usr/local/share/template-files/data/$name" - cp -Rf "$data/." "/usr/local/share/template-files/data/$name/" - else - cp -Rf "$data" "/usr/local/share/template-files/data/$name" - fi +if [ -d "/tmp/usr" ]; then + for share in "/tmp/usr"/*; do + [ -e "$share" ] || continue + name="${share##*/}" + dest="/usr/$name" + echo "Installing $share to $dest" + mkdir -p "$dest" + cp -Rf "$share/." "$dest/" done fi -unset data +unset share # - - - - - - - - - - - - - - - - - - - - - - - - - # Main script diff --git a/rootfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh index 0946329..3540226 100755 --- a/rootfs/root/docker/setup/04-users.sh +++ b/rootfs/root/docker/setup/04-users.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:23 PM EDT 2026 # @@File : 04-users.sh # @@Description : script to run users # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh index e3d29fb..f4e121e 100755 --- a/rootfs/root/docker/setup/05-custom.sh +++ b/rootfs/root/docker/setup/05-custom.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:23 PM EDT 2026 # @@File : 05-custom.sh # @@Description : script to run custom # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh index 8e2face..c9c04fb 100755 --- a/rootfs/root/docker/setup/06-post.sh +++ b/rootfs/root/docker/setup/06-post.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:24 PM EDT 2026 # @@File : 06-post.sh # @@Description : script to run post # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/07-cleanup.sh b/rootfs/root/docker/setup/07-cleanup.sh index 74f7943..8a97add 100755 --- a/rootfs/root/docker/setup/07-cleanup.sh +++ b/rootfs/root/docker/setup/07-cleanup.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605242057-git +##@Version : 202607081859-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 24 08:57:01 PM EDT 2026 +# @@Created : Wed Jul 8 06:59:24 PM EDT 2026 # @@File : 07-cleanup.sh # @@Description : script to run cleanup # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Load functions diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index c3cb355..50371e0 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202606261500-git +##@Version : 202606272100-git # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.pro # @@License : WTFPL # @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments -# @@Created : Friday, Jun 05, 2026 18:22 EDT +# @@Created : Wednesday, Jul 08, 2026 18:59 EDT # @@File : entrypoint.sh # @@Description : Entrypoint file for alpine # @@Changelog : New script @@ -123,7 +123,7 @@ export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_RO # show message __run_message() { - return + return 0 } # - - - - - - - - - - - - - - - - - - - - - - - - - ################## END OF CONFIGURATION ##################### @@ -370,7 +370,7 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then # - - - - - - - - - - - - - - - - - - - - - - - - - # import hosts file into container if [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then - grep -vF "$HOSTNAME" "/usr/local/etc/hosts" 2>/dev/null >>"/etc/hosts" || true + grep -vF -- "$HOSTNAME" "/usr/local/etc/hosts" 2>/dev/null >>"/etc/hosts" || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - # import resolv.conf file into container @@ -422,8 +422,8 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ] || [ "$CONFIG_DIR_INITIALIZED" = "no" ] | echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - - # setup the smtp server — non-fatal; this image does not use ssmtp - __setup_mta || true + # setup the smtp server + __setup_mta # - - - - - - - - - - - - - - - - - - - - - - - - - ENTRYPOINT_FIRST_RUN="no" fi @@ -576,7 +576,7 @@ healthcheck) services+="$name " done fi - services="$(printf '%s\n' $services | sort -u | grep -v '^$')" + services="$(printf '%s\n' $services | sort -u | grep -v -- '^$')" for proc in $services; do if [ -n "$proc" ]; then if ! __pgrep "$proc"; then @@ -587,7 +587,7 @@ healthcheck) done for port in $healthPorts; do if command -v netstat &>/dev/null && [ -n "$port" ]; then - if ! netstat -taupln | grep -q ":$port "; then + if ! netstat -taupln | grep -q -- ":$port "; then echo "$port isn't open" >&2 healthStatus=$((healthStatus + 1)) fi @@ -617,7 +617,7 @@ ports) # show running processes procs) shift 1 - ps="$(__ps axco command 2>/dev/null | grep -vE '^(COMMAND|grep|ps)$' | sort -u)" + ps="$(__ps axco command 2>/dev/null | grep -vE -- '^(COMMAND|grep|ps)$' | sort -u)" [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' ' exit $? ;;