🗃️ Update codebase 🗃️

rootfs/usr/local/bin/entrypoint.sh

Dockerfile
.env.scripts
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/functions/entrypoint.sh

.env.scripts

@@ -1,60 +1,79 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202509161150-git
+##@Version           :  202510220838-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Tue Sep 16 11:50:48 AM EDT 2025
+# @@Created          :  Wed Oct 22 08:38:42 AM EDT 2025
 # @@File             :  .env.scripts
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
+# @@TODO             :  Refactor code
+# @@Other            :  N/A
+# @@Resource         :  N/A
+# @@Terminal App     :  yes
+# @@sudo/root        :  yes
+# @@Template         :  templates/dockerfiles/dotenv.template
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317,SC2329
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # entrypoint Settings
 DOCKER_ENTYPOINT_PORTS_WEB="${DOCKER_ENTYPOINT_PORTS_WEB}"
 DOCKER_ENTYPOINT_PORTS_SRV="${DOCKER_ENTYPOINT_PORTS_SRV}"
 DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS"
 DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Dockerfile info
 ENV_DOCKERFILE="Dockerfile"
 ENV_IMAGE_NAME="tor"
 ENV_USE_TEMPLATE="alpine"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Maintainer info
 ENV_ORG_NAME="casjaysdevdocker"
 ENV_VENDOR="CasjaysDev"
 ENV_AUTHOR="CasjaysDev"
 ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# REPO info
+# Repository URLs (Full URLs)
+# ENV_GIT_REPO_URL: Complete Git repository URL for source code
 ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/tor"
-ENV_REGISTRY_URL="docker.io"
+# ENV_REGISTRY_URL: Complete registry URL for reference (NOT used for pushing)
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ENV_REGISTRY_URL="docker.io/casjaysdevdocker/tor"
-# Push image info
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Push Configuration
+# ENV_IMAGE_PUSH: Complete push destination (this IS used for pushing)
 ENV_IMAGE_PUSH="casjaysdevdocker/tor"
+# ENV_IMAGE_TAG: Default tag for the image
 ENV_IMAGE_TAG="latest"
+# ENV_ADD_TAGS: Additional tags, comma-separated (USE_DATE = auto date tag)
 ENV_ADD_TAGS="USE_DATE"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
 ENV_ADD_IMAGE_PUSH=""
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Pull image info
+# Pull Configuration
+# ENV_PULL_URL: Source image to pull from (base image)
 ENV_PULL_URL="casjaysdev/alpine"
+# ENV_DISTRO_TAG: Tag for the pull source image
 ENV_DISTRO_TAG="${IMAGE_VERSION}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Env
 SERVICE_PORT="80"
 EXPOSE_PORTS="80 9053 9050 9080"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Versions
 PHP_VERSION="84"
 NODE_VERSION="system"
 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="tor torsocks lyrebird privoxy unbound nginx php\$PHP_VERSION"
+ENV_PACKAGES='tor torsocks lyrebird privoxy unbound nginx php$PHP_VERSION'
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
+# - - - - - - - - - - - - - - - - - - - - - - - - -

Dockerfile

@@ -1,7 +1,7 @@
 # Docker image for tor using the alpine template
 ARG IMAGE_NAME="tor"
 ARG PHP_SERVER="tor"
-ARG BUILD_DATE="202509161150"
+ARG BUILD_DATE="202510220838"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
@@ -54,7 +54,7 @@ ARG PHP_SERVER
 ARG SHELL_OPTS
 ARG PATH
 
-ARG PACK_LIST="tor torsocks lyrebird privoxy unbound nginx php$PHP_VERSION"
+ARG PACK_LIST="tor torsocks lyrebird privoxy unbound nginx php$PHP_VERSION "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
@@ -219,8 +219,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="docker.io"
+LABEL org.opencontainers.image.url="docker.io/casjaysdevdocker/tor"
-LABEL org.opencontainers.image.source="docker.io"
+LABEL org.opencontainers.image.source="docker.io/casjaysdevdocker/tor"
 LABEL org.opencontainers.image.vcs-type="Git"
 LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
 LABEL org.opencontainers.image.source="https://github.com/casjaysdevdocker/tor"

rootfs/usr/local/bin/entrypoint.sh

@@ -21,7 +21,6 @@
 # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
 trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html