🗃️ Updated Dockerfile* and .env.scripts* 🗃️

Dockerfile Dockerfile.1.46 Dockerfile.2.0 Dockerfile.2.1 .env.scripts .env.scripts.1.46 .env.scripts.2.0 .env.scripts.2.1 .gitea/workflows/docker-1_46.yaml .gitea/workflows/docker.1.yaml .gitea/workflows/docker-2_0.yaml .gitea/workflows/docker-2_1.yaml .gitea/workflows/docker.2.yaml .gitea/workflows/docker.yaml rootfs/root/docker/setup/05-custom.sh rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh
2025-11-30 22:14:04 -05:00 · 2025-11-29 11:06:59 -05:00
parent aaf8e8d945
commit 803a26708c
17 changed files with 2574 additions and 1282 deletions
--- a/.env.scripts
+++ b/.env.scripts
@@ -1,12 +1,21 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202509161147-git
+##@Version           :  202511291200-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Tue Sep 16 11:47:17 AM EDT 2025
+# @@Created          :  Fri Nov 29 12:00:00 PM EST 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}"
@@ -20,31 +29,33 @@ ENV_IMAGE_NAME="deno"
 ENV_USE_TEMPLATE="alpine"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Maintainer info
-ENV_ORG_NAME="casjaysdevdocker"
+ENV_ORG_NAME="casjaysdev"
 ENV_VENDOR="CasjaysDev"
 ENV_AUTHOR="CasjaysDev"
 ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# REPO info
-ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/deno"
-ENV_REGISTRY_URL="docker.io"
+# Repository URLs (Full URLs)
+ENV_GIT_REPO_URL="https://github.com/casjaysdev/deno"
+ENV_REGISTRY_URL="docker.io/casjaysdev/deno"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Push image info
-ENV_IMAGE_PUSH="casjaysdevdocker/deno"
+# Push Configuration
+ENV_IMAGE_PUSH="casjaysdev/deno"
 ENV_IMAGE_TAG="latest"
-ENV_ADD_TAGS=""
+ENV_ADD_TAGS="USE_DATE"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
 ENV_ADD_IMAGE_PUSH=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Pull image info
-ENV_PULL_URL="casjaysdev/alpine"
-ENV_DISTRO_TAG="${IMAGE_VERSION}"
+# Pull Configuration
+ENV_PULL_URL="alpine"
+ENV_DISTRO_TAG="latest"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Env
 SERVICE_PORT=""
 EXPOSE_PORTS=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Versions
+LANG_VERSION="latest"
 PHP_VERSION="system"
 NODE_VERSION="system"
 NODE_MANAGER="system"
@@ -56,5 +67,7 @@ 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=""
+ENV_PACKAGES="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.1.46
+++ b/.env.scripts.1.46
@@ -0,0 +1,73 @@
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202511291200-git
+# @@Author           :  CasjaysDev
+# @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
+# @@License          :  MIT
+# @@Copyright        :  Copyright 2025 CasjaysDev
+# @@Created          :  Fri Nov 29 12:00:00 PM EST 2025
+# @@File             :  .env.scripts.1.46
+# @@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.1.46"
+ENV_IMAGE_NAME="deno"
+ENV_USE_TEMPLATE="alpine"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Maintainer info
+ENV_ORG_NAME="casjaysdev"
+ENV_VENDOR="CasjaysDev"
+ENV_AUTHOR="CasjaysDev"
+ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Repository URLs (Full URLs)
+ENV_GIT_REPO_URL="https://github.com/casjaysdev/deno"
+ENV_REGISTRY_URL="docker.io/casjaysdev/deno"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Push Configuration
+ENV_IMAGE_PUSH="casjaysdev/deno"
+ENV_IMAGE_TAG="1.46"
+ENV_ADD_TAGS="USE_DATE"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
+ENV_ADD_IMAGE_PUSH=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Pull Configuration
+ENV_PULL_URL="alpine"
+ENV_DISTRO_TAG="latest"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Env
+SERVICE_PORT=""
+EXPOSE_PORTS=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Versions
+LANG_VERSION="1.46"
+PHP_VERSION="system"
+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="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.2.0
+++ b/.env.scripts.2.0
@@ -0,0 +1,73 @@
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202511291200-git
+# @@Author           :  CasjaysDev
+# @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
+# @@License          :  MIT
+# @@Copyright        :  Copyright 2025 CasjaysDev
+# @@Created          :  Fri Nov 29 12:00:00 PM EST 2025
+# @@File             :  .env.scripts.2.0
+# @@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.2.0"
+ENV_IMAGE_NAME="deno"
+ENV_USE_TEMPLATE="alpine"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Maintainer info
+ENV_ORG_NAME="casjaysdev"
+ENV_VENDOR="CasjaysDev"
+ENV_AUTHOR="CasjaysDev"
+ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Repository URLs (Full URLs)
+ENV_GIT_REPO_URL="https://github.com/casjaysdev/deno"
+ENV_REGISTRY_URL="docker.io/casjaysdev/deno"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Push Configuration
+ENV_IMAGE_PUSH="casjaysdev/deno"
+ENV_IMAGE_TAG="2.0"
+ENV_ADD_TAGS="USE_DATE"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
+ENV_ADD_IMAGE_PUSH=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Pull Configuration
+ENV_PULL_URL="alpine"
+ENV_DISTRO_TAG="latest"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Env
+SERVICE_PORT=""
+EXPOSE_PORTS=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Versions
+LANG_VERSION="2.0"
+PHP_VERSION="system"
+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="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.2.1
+++ b/.env.scripts.2.1
@@ -0,0 +1,73 @@
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202511291200-git
+# @@Author           :  CasjaysDev
+# @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
+# @@License          :  MIT
+# @@Copyright        :  Copyright 2025 CasjaysDev
+# @@Created          :  Fri Nov 29 12:00:00 PM EST 2025
+# @@File             :  .env.scripts.2.1
+# @@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.2.1"
+ENV_IMAGE_NAME="deno"
+ENV_USE_TEMPLATE="alpine"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Maintainer info
+ENV_ORG_NAME="casjaysdev"
+ENV_VENDOR="CasjaysDev"
+ENV_AUTHOR="CasjaysDev"
+ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Repository URLs (Full URLs)
+ENV_GIT_REPO_URL="https://github.com/casjaysdev/deno"
+ENV_REGISTRY_URL="docker.io/casjaysdev/deno"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Push Configuration
+ENV_IMAGE_PUSH="casjaysdev/deno"
+ENV_IMAGE_TAG="2.1"
+ENV_ADD_TAGS="USE_DATE"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
+ENV_ADD_IMAGE_PUSH=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Pull Configuration
+ENV_PULL_URL="alpine"
+ENV_DISTRO_TAG="latest"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Env
+SERVICE_PORT=""
+EXPOSE_PORTS=""
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Versions
+LANG_VERSION="2.1"
+PHP_VERSION="system"
+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="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.gitea/workflows/docker-1_46.yaml
+++ b/.gitea/workflows/docker-1_46.yaml
@@ -0,0 +1,48 @@
+name: deno-1.46
+
+on: push
+
+jobs:
+  release-deno-1_46:
+    runs-on: act_runner
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo DOCKER_TAG=1.46 >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.1.46
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
--- a/.gitea/workflows/docker-2_0.yaml
+++ b/.gitea/workflows/docker-2_0.yaml
@@ -0,0 +1,48 @@
+name: deno-2.0
+
+on: push
+
+jobs:
+  release-deno-2_0:
+    runs-on: act_runner
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo DOCKER_TAG=2.0 >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.2.0
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
--- a/.gitea/workflows/docker-2_1.yaml
+++ b/.gitea/workflows/docker-2_1.yaml
@@ -0,0 +1,48 @@
+name: deno-2.1
+
+on: push
+
+jobs:
+  release-deno-2_1:
+    runs-on: act_runner
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo DOCKER_TAG=2.1 >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.2.1
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
--- a/.gitea/workflows/docker.1.yaml
+++ b/.gitea/workflows/docker.1.yaml
@@ -0,0 +1,48 @@
+name: deno-1
+
+on: push
+
+jobs:
+  release-deno-1:
+    runs-on: act_runner
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo DOCKER_TAG=1.46 >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.1.46
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
--- a/.gitea/workflows/docker.2.yaml
+++ b/.gitea/workflows/docker.2.yaml
@@ -0,0 +1,48 @@
+name: deno-2
+
+on: push
+
+jobs:
+  release-deno-2:
+    runs-on: act_runner
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo DOCKER_TAG=2.1 >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.2.1
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -46,7 +46,6 @@ jobs:
            linux/amd64
            linux/arm64
          push: true
-          tags: | # replace it with your local IP and tags
+          tags: |
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DATE_TAG }}
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
-
--- a/62
+++ b/62
@@ -1,7 +1,8 @@
-# Docker image for deno using the alpine template
+# syntax=docker/dockerfile:1
+# Docker image for alpine using the alpine template
 ARG IMAGE_NAME="deno"
 ARG PHP_SERVER="deno"
-ARG BUILD_DATE="202509161147"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
@@ -9,7 +10,6 @@ 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 PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -19,13 +19,14 @@ ARG EXPOSE_PORTS=""
 ARG PHP_VERSION="system"
 ARG NODE_VERSION="system"
 ARG NODE_MANAGER="system"
+ARG LANG_VERSION="latest"

-ARG IMAGE_REPO="casjaysdevdocker/deno"
+ARG IMAGE_REPO="casjaysdev/deno"
 ARG IMAGE_VERSION="latest"
-ARG CONTAINER_VERSION=""
+ARG CONTAINER_VERSION="USE_DATE"

-ARG PULL_URL="casjaysdev/alpine"
-ARG DISTRO_VERSION="${IMAGE_VERSION}"
+ARG PULL_URL="alpine"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"

 FROM tianon/gosu:latest AS gosu
@@ -52,31 +53,31 @@ ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH

-ARG PACK_LIST=" "
+ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "

 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-deno"
+ENV HOSTNAME="casjaysdev-deno"

 USER ${USER}
 WORKDIR /root

 COPY ./rootfs/usr/local/bin/. /usr/local/bin/

-RUN set -e; \
-  echo "Updating the system and ensuring bash is installed"; \
-  pkmgr update;pkmgr install bash
-
 RUN set -e; \
  echo "Setting up prerequisites"; \
-  true
+  apk --no-cache add bash; \
+  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
+  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true

 ENV SHELL="/bin/bash"
 SHELL [ "/bin/bash", "-c" ]
@@ -91,7 +92,11 @@ RUN echo "Initializing the system"; \

 RUN echo "Creating and editing system files "; \
  $SHELL_OPTS; \
-  [ -f "/root/.profile" ] || touch "/root/.profile"; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
  echo ""

@@ -128,7 +133,7 @@ RUN echo "Updating system files "; \
  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -183,7 +188,6 @@ RUN echo "Deleting unneeded files"; \
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -204,14 +208,14 @@ ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""

 USER ${USER}
 WORKDIR /root

 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
 LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
@@ -219,26 +223,25 @@ 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.source="docker.io"
+LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/deno"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/deno"
 LABEL org.opencontainers.image.vcs-type="Git"
 LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
-LABEL org.opencontainers.image.source="https://github.com/casjaysdevdocker/deno"
-LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/deno"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/deno"
+LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/deno"
 LABEL com.github.containers.toolbox="false"

 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-deno"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -252,5 +255,6 @@ VOLUME [ "/config","/data" ]

 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}

-ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh", "start" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
--- a/Dockerfile.1.46
+++ b/Dockerfile.1.46
@@ -0,0 +1,260 @@
+# syntax=docker/dockerfile:1
+# Docker image for alpine using the alpine template
+ARG IMAGE_NAME="deno"
+ARG PHP_SERVER="deno"
+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"
+
+ARG SERVICE_PORT=""
+ARG EXPOSE_PORTS=""
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"
+ARG LANG_VERSION="latest"
+
+ARG IMAGE_REPO="casjaysdev/deno"
+ARG IMAGE_VERSION="1.46"
+ARG CONTAINER_VERSION="USE_DATE"
+
+ARG PULL_URL="alpine"
+ARG DISTRO_VERSION="latest"
+ARG BUILD_VERSION="${BUILD_DATE}"
+
+FROM tianon/gosu:latest AS gosu
+FROM ${PULL_URL}:${DISTRO_VERSION} AS build
+ARG TZ
+ARG USER
+ARG LICENSE
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG SHELL_OPTS
+
+ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-deno"
+
+USER ${USER}
+WORKDIR /root
+
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
+
+RUN set -e; \
+  echo "Setting up prerequisites"; \
+  apk --no-cache add bash; \
+  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
+  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
+
+ENV SHELL="/bin/bash"
+SHELL [ "/bin/bash", "-c" ]
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+
+RUN echo "Initializing the system"; \
+  $SHELL_OPTS; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
+  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
+  echo ""
+
+RUN echo "Creating and editing system files "; \
+  $SHELL_OPTS; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
+  echo ""
+
+RUN echo "Running pre-package commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up and installing packages"; \
+  $SHELL_OPTS; \
+  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
+  echo ""
+
+RUN echo "Initializing packages before copying files to image"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
+  echo ""
+
+COPY ./rootfs/. /
+COPY ./Dockerfile /root/docker/Dockerfile
+
+RUN echo "Updating system files "; \
+  $SHELL_OPTS; \
+  echo "$TIMEZONE" >"/etc/timezone"; \
+  touch "/etc/profile" "/root/.profile"; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
+  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
+  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
+  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
+  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
+  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
+  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
+  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
+  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
+  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
+  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
+  echo ""
+
+RUN echo "Custom Settings"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up users and scripts "; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
+  echo ""
+
+RUN echo "Running the user init commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting OS Settings "; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Custom Applications"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Running custom commands"; \
+  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
+  echo ""
+
+RUN echo "Running final commands before cleanup"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
+  echo ""
+
+RUN echo "Deleting unneeded files"; \
+  $SHELL_OPTS; \
+  pkmgr clean; \
+  rm -Rf "/config" "/data" || true; \
+  rm -rf /etc/systemd/system/*.wants/* || true; \
+  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
+  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
+  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
+  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
+  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
+  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
+  echo ""
+
+RUN echo "Init done"
+FROM scratch
+ARG TZ
+ARG USER
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG LICENSE="WTFPL"
+ARG ENV_PORTS=""
+
+USER ${USER}
+WORKDIR /root
+
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+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/deno"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/deno"
+LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/deno"
+LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/deno"
+LABEL com.github.containers.toolbox="false"
+
+ENV ENV=~/.bashrc
+ENV USER="${USER}"
+ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV PORT="${SERVICE_PORT}"
+ENV ENV_PORTS="${ENV_PORTS}"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-deno"
+ENV PHP_SERVER="${PHP_SERVER}"
+ENV NODE_VERSION="${NODE_VERSION}"
+ENV NODE_MANAGER="${NODE_MANAGER}"
+ENV PHP_VERSION="${PHP_VERSION}"
+ENV DISTRO_VERSION="${IMAGE_VERSION}"
+ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+
+COPY --from=build /. /
+
+VOLUME [ "/config","/data" ]
+
+EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
--- a/Dockerfile.2.0
+++ b/Dockerfile.2.0
@@ -0,0 +1,260 @@
+# syntax=docker/dockerfile:1
+# Docker image for alpine using the alpine template
+ARG IMAGE_NAME="deno"
+ARG PHP_SERVER="deno"
+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"
+
+ARG SERVICE_PORT=""
+ARG EXPOSE_PORTS=""
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"
+ARG LANG_VERSION="latest"
+
+ARG IMAGE_REPO="casjaysdev/deno"
+ARG IMAGE_VERSION="2.0"
+ARG CONTAINER_VERSION="USE_DATE"
+
+ARG PULL_URL="alpine"
+ARG DISTRO_VERSION="latest"
+ARG BUILD_VERSION="${BUILD_DATE}"
+
+FROM tianon/gosu:latest AS gosu
+FROM ${PULL_URL}:${DISTRO_VERSION} AS build
+ARG TZ
+ARG USER
+ARG LICENSE
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG SHELL_OPTS
+
+ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-deno"
+
+USER ${USER}
+WORKDIR /root
+
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
+
+RUN set -e; \
+  echo "Setting up prerequisites"; \
+  apk --no-cache add bash; \
+  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
+  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
+
+ENV SHELL="/bin/bash"
+SHELL [ "/bin/bash", "-c" ]
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+
+RUN echo "Initializing the system"; \
+  $SHELL_OPTS; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
+  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
+  echo ""
+
+RUN echo "Creating and editing system files "; \
+  $SHELL_OPTS; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
+  echo ""
+
+RUN echo "Running pre-package commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up and installing packages"; \
+  $SHELL_OPTS; \
+  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
+  echo ""
+
+RUN echo "Initializing packages before copying files to image"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
+  echo ""
+
+COPY ./rootfs/. /
+COPY ./Dockerfile /root/docker/Dockerfile
+
+RUN echo "Updating system files "; \
+  $SHELL_OPTS; \
+  echo "$TIMEZONE" >"/etc/timezone"; \
+  touch "/etc/profile" "/root/.profile"; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
+  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
+  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
+  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
+  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
+  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
+  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
+  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
+  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
+  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
+  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
+  echo ""
+
+RUN echo "Custom Settings"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up users and scripts "; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
+  echo ""
+
+RUN echo "Running the user init commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting OS Settings "; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Custom Applications"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Running custom commands"; \
+  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
+  echo ""
+
+RUN echo "Running final commands before cleanup"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
+  echo ""
+
+RUN echo "Deleting unneeded files"; \
+  $SHELL_OPTS; \
+  pkmgr clean; \
+  rm -Rf "/config" "/data" || true; \
+  rm -rf /etc/systemd/system/*.wants/* || true; \
+  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
+  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
+  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
+  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
+  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
+  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
+  echo ""
+
+RUN echo "Init done"
+FROM scratch
+ARG TZ
+ARG USER
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG LICENSE="WTFPL"
+ARG ENV_PORTS=""
+
+USER ${USER}
+WORKDIR /root
+
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+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/deno"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/deno"
+LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/deno"
+LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/deno"
+LABEL com.github.containers.toolbox="false"
+
+ENV ENV=~/.bashrc
+ENV USER="${USER}"
+ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV PORT="${SERVICE_PORT}"
+ENV ENV_PORTS="${ENV_PORTS}"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-deno"
+ENV PHP_SERVER="${PHP_SERVER}"
+ENV NODE_VERSION="${NODE_VERSION}"
+ENV NODE_MANAGER="${NODE_MANAGER}"
+ENV PHP_VERSION="${PHP_VERSION}"
+ENV DISTRO_VERSION="${IMAGE_VERSION}"
+ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+
+COPY --from=build /. /
+
+VOLUME [ "/config","/data" ]
+
+EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
--- a/Dockerfile.2.1
+++ b/Dockerfile.2.1
@@ -0,0 +1,260 @@
+# syntax=docker/dockerfile:1
+# Docker image for alpine using the alpine template
+ARG IMAGE_NAME="deno"
+ARG PHP_SERVER="deno"
+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"
+
+ARG SERVICE_PORT=""
+ARG EXPOSE_PORTS=""
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"
+ARG LANG_VERSION="latest"
+
+ARG IMAGE_REPO="casjaysdev/deno"
+ARG IMAGE_VERSION="2.1"
+ARG CONTAINER_VERSION="USE_DATE"
+
+ARG PULL_URL="alpine"
+ARG DISTRO_VERSION="latest"
+ARG BUILD_VERSION="${BUILD_DATE}"
+
+FROM tianon/gosu:latest AS gosu
+FROM ${PULL_URL}:${DISTRO_VERSION} AS build
+ARG TZ
+ARG USER
+ARG LICENSE
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG SHELL_OPTS
+
+ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools coreutils sed gawk grep attr findutils readline lsof less curl shadow certbot ca-certificates "
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-deno"
+
+USER ${USER}
+WORKDIR /root
+
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
+
+RUN set -e; \
+  echo "Setting up prerequisites"; \
+  apk --no-cache add bash; \
+  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
+  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
+
+ENV SHELL="/bin/bash"
+SHELL [ "/bin/bash", "-c" ]
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+
+RUN echo "Initializing the system"; \
+  $SHELL_OPTS; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
+  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
+  echo ""
+
+RUN echo "Creating and editing system files "; \
+  $SHELL_OPTS; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
+  echo ""
+
+RUN echo "Running pre-package commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up and installing packages"; \
+  $SHELL_OPTS; \
+  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
+  echo ""
+
+RUN echo "Initializing packages before copying files to image"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
+  echo ""
+
+COPY ./rootfs/. /
+COPY ./Dockerfile /root/docker/Dockerfile
+
+RUN echo "Updating system files "; \
+  $SHELL_OPTS; \
+  echo "$TIMEZONE" >"/etc/timezone"; \
+  touch "/etc/profile" "/root/.profile"; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
+  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
+  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
+  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
+  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
+  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
+  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
+  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
+  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
+  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
+  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
+  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
+  echo ""
+
+RUN echo "Custom Settings"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting up users and scripts "; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
+  echo ""
+
+RUN echo "Running the user init commands"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Setting OS Settings "; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Custom Applications"; \
+  $SHELL_OPTS; \
+  echo ""
+
+RUN echo "Running custom commands"; \
+  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
+  echo ""
+
+RUN echo "Running final commands before cleanup"; \
+  $SHELL_OPTS; \
+  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
+  echo ""
+
+RUN echo "Deleting unneeded files"; \
+  $SHELL_OPTS; \
+  pkmgr clean; \
+  rm -Rf "/config" "/data" || true; \
+  rm -rf /etc/systemd/system/*.wants/* || true; \
+  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
+  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
+  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
+  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
+  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
+  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
+  echo ""
+
+RUN echo "Init done"
+FROM scratch
+ARG TZ
+ARG USER
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG BUILD_DATE
+ARG SERVICE_PORT
+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
+ARG PHP_VERSION
+ARG PHP_SERVER
+ARG LICENSE="WTFPL"
+ARG ENV_PORTS=""
+
+USER ${USER}
+WORKDIR /root
+
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+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/deno"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/deno"
+LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/deno"
+LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/deno"
+LABEL com.github.containers.toolbox="false"
+
+ENV ENV=~/.bashrc
+ENV USER="${USER}"
+ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV PORT="${SERVICE_PORT}"
+ENV ENV_PORTS="${ENV_PORTS}"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-deno"
+ENV PHP_SERVER="${PHP_SERVER}"
+ENV NODE_VERSION="${NODE_VERSION}"
+ENV NODE_MANAGER="${NODE_MANAGER}"
+ENV PHP_VERSION="${PHP_VERSION}"
+ENV DISTRO_VERSION="${IMAGE_VERSION}"
+ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+
+COPY --from=build /. /
+
+VOLUME [ "/config","/data" ]
+
+EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
--- a/rootfs/root/docker/setup/05-custom.sh
+++ b/rootfs/root/docker/setup/05-custom.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202509161145-git
+##@Version           :  202511291200-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
@@ -8,7 +8,7 @@
 # @@Copyright        :  Copyright 2023 CasjaysDev
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  05-custom.sh
-# @@Description      :  script to run custom
+# @@Description      :  script to install Deno
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # shellcheck shell=bash
 # shellcheck disable=SC2016
@@ -24,15 +24,35 @@ set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
+LANG_VERSION="${LANG_VERSION:-latest}"

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
+echo "Installing Deno version: ${LANG_VERSION}"

-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Main script
+# Install Deno
+if [ "$LANG_VERSION" = "latest" ]; then
+  echo "Installing latest Deno..."
+  curl -fsSL https://deno.land/install.sh | sh || exitCode=1
+else
+  echo "Installing Deno v${LANG_VERSION}..."
+  # Deno versions need v prefix and patch version
+  curl -fsSL https://deno.land/install.sh | sh -s "v${LANG_VERSION}.0" || exitCode=1
+fi
+
+# Move to /usr/local/bin
+if [ -f "$HOME/.deno/bin/deno" ]; then
+  mv "$HOME/.deno/bin/deno" /usr/local/bin/deno || exitCode=1
+  rm -rf "$HOME/.deno"
+  echo "Deno installed successfully"
+  deno --version || exitCode=1
+else
+  echo "Deno installation failed" >&2
+  exitCode=1
+fi

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
-#exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 exit $exitCode
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,49 +1,46 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202509161147-git
-# @@Author           :  Jason Hempstead
-# @@Contact          :  jason@casjaysdev.pro
-# @@License          :  LICENSE.md
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  GEN_SCRIPT_REPLACE_VERSION
+# @@Author           :  GEN_SCRIPT_REPLACE_AUTHOR
+# @@Contact          :  GEN_SCRIPT_REPLACE_EMAIL
+# @@License          :  GEN_SCRIPT_REPLACE_LICENSE
 # @@ReadME           :  entrypoint.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Tuesday, Sep 16, 2025 11:47 EDT
+# @@Copyright        :  GEN_SCRIPT_REPLACE_COPYRIGHT
+# @@Created          :  GEN_SCRIPT_REPLACE_DATE
 # @@File             :  entrypoint.sh
-# @@Description      :  Entrypoint file for deno
-# @@Changelog        :  New script
-# @@TODO             :  Better documentation
-# @@Other            :  
-# @@Resource         :  
-# @@Terminal App     :  no
-# @@sudo/root        :  no
+# @@Description      :  Entrypoint file for GEN_SCRIPT_REPLACE_APPNAME
+# @@Changelog        :  GEN_SCRIPT_REPLACE_CHANGELOG
+# @@TODO             :  GEN_SCRIPT_REPLACE_TODO
+# @@Other            :  GEN_SCRIPT_REPLACE_OTHER
+# @@Resource         :  GEN_SCRIPT_REPLACE_RES
+# @@Terminal App     :  GEN_SCRIPT_REPLACE_TERMINAL
+# @@sudo/root        :  GEN_SCRIPT_REPLACE_SUDO
 # @@Template         :  other/docker-entrypoint
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317,SC2329
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-set -e
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,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
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' INT TERM PWR
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
 { [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 SCRIPT_FILE="$0"
-CONTAINER_NAME="deno"
+CONTAINER_NAME="GEN_SCRIPT_REPLACE_APPNAME"
 SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
 CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # remove whitespaces from beginning argument
 while :; do [ "$1" = " " ] && shift 1 || break; done
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 [ "$1" = "$SCRIPT_FILE" ] && shift 1
 [ "$1" = "$SCRIPT_NAME" ] && shift 1
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # import the functions file
 if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then
  . "/usr/local/etc/docker/functions/entrypoint.sh"
@@ -51,7 +48,7 @@ else
  echo "Can not load functions from /usr/local/etc/docker/functions/entrypoint.sh"
  exit 1
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 case "$1" in
 # Help message
 -h | --help)
@@ -65,60 +62,60 @@ case "$1" in
  shift
  ;;
 esac
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the default env files
 __create_env_file "/config/env/default.sh" "/root/env.sh" &>/dev/null
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables from files
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
  [ -f "$set_env" ] && . "$set_env"
 done
 unset set_env
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # User to use to launch service - IE: postgres
 RUNAS_USER="root" # normally root
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group from env
 SERVICE_USER="${PUID:-$SERVICE_USER}"
 SERVICE_GROUP="${PGID:-$SERVICE_GROUP}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group ID
 SERVICE_UID="${SERVICE_UID:-0}" # set the user id
 SERVICE_GID="${SERVICE_GID:-0}" # set the group id
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
-SERVICE_USER="${SERVICE_USER:-$deno}"  # execute command as another user
-SERVICE_GROUP="${SERVICE_GROUP:-deno}" # Set the service group
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+SERVICE_USER="${SERVICE_USER:-GEN_SCRIPT_REPLACE_APPNAME}"   # execute command as another user
+SERVICE_GROUP="${SERVICE_GROUP:-GEN_SCRIPT_REPLACE_APPNAME}" # Set the service group
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
 SERVER_PORTS="" # specifiy other ports
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Primary server port- will be added to server ports
 WEB_SERVER_PORT="" # port : 80,443
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
 HEALTH_ENABLED="yes" # enable healthcheck [yes/no]
-SERVICES_LIST="tini" # comma seperated list of processes for the healthcheck
+SERVICES_LIST="tini" # comma separated list of processes for the healthcheck
 HEALTH_ENDPOINTS=""  # url endpoints: [http://localhost/health,http://localhost/test]
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Update path var
 export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_ROOT_DIR DATABASE_DIR
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Custom variables

-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # show message
 __run_message() {

  return
 }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ################## END OF CONFIGURATION #####################
 # Lets get containers ip address
 IP4_ADDRESS="$(__get_ip4)"
 IP6_ADDRESS="$(__get_ip6)"
 CONTAINER_IP4_ADDRESS="${CONTAINER_IP4_ADDRESS:-$IP4_ADDRESS}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Startup variables
 export INIT_DATE="${INIT_DATE:-$(date)}"
 export CONTAINER_INIT="${CONTAINER_INIT:-no}"
@@ -128,14 +125,14 @@ export ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}"
 export DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-no}"
 export CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-no}"
 export CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # System
 export LANG="${LANG:-C.UTF-8}"
 export LC_ALL="${LANG:-C.UTF-8}"
 export TZ="${TZ:-${TIMEZONE:-America/New_York}}"
 export HOSTNAME="$(hostname -s)"
 export DOMAINNAME="$(hostname -d)"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
 export SSL_DIR="${SSL_DIR:-/config/ssl}"
 export SSL_CA="${SSL_CERT:-/config/ssl/ca.crt}"
@@ -145,12 +142,12 @@ export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
 export DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"
 export DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}"
 export DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Backup settings
 export BACKUP_MAX_DAYS="${BACKUP_MAX_DAYS:-}"
 export BACKUP_RUN_CRON="${BACKUP_RUN_CRON:-}"
 export BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional
 export PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
 export PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
@@ -163,7 +160,7 @@ export ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-$ENTRYPOINT_PID_FILE}"
 export ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
 export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
 export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then
  www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")"
  rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/*
@@ -173,42 +170,42 @@ if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then
  rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1
  rm -Rf "$www_temp_dir"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # variables based on env/files
 [ -f "/config/enable/ssl" ] && SSL_ENABLED="yes"
 [ -f "/config/enable/ssh" ] && SSH_ENABLED="yes"
 [ "$WEB_SERVER_PORT" = "443" ] && SSL_ENABLED="yes"
 [ "$CONTAINER_WEB_SERVER_PROTOCOL" = "https" ] && SSL_ENABLED="yes"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # export variables

-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # is already Initialized
 [ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="yes" || DATA_DIR_INITIALIZED="no"
 [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="yes" || CONFIG_DIR_INITIALIZED="no"
 { [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; } && ENTRYPOINT_FIRST_RUN="no" || ENTRYPOINT_FIRST_RUN="yes"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # clean ENV_PORTS variables
 ENV_PORTS="${ENV_PORTS//,/ }"  #
 ENV_PORTS="${ENV_PORTS//\/*/}" #
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # clean SERVER_PORTS variables
 SERVER_PORTS="${SERVER_PORTS//,/ }"  #
 SERVER_PORTS="${SERVER_PORTS//\/*/}" #
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # clean WEB_SERVER_PORTS variables
 WEB_SERVER_PORTS="${WEB_SERVER_PORT//\/*/}"                             #
 WEB_SERVER_PORTS="${WEB_SERVER_PORTS//\/*/}"                            #
 WEB_SERVER_PORTS="${WEB_SERVER_PORT//,/ } ${ENV_WEB_SERVER_PORTS//,/ }" #
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # rewrite and merge variables
 ENV_PORTS="$(__format_variables "$ENV_PORTS" || false)"
 WEB_SERVER_PORTS="$(__format_variables "$WEB_SERVER_PORTS" || false)"
 ENV_PORTS="$(__format_variables "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS" "$SERVER_PORTS" || false)"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Remove the commas from env
 HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required directories
 mkdir -p "/run"
 mkdir -p "/tmp"
@@ -221,11 +218,11 @@ mkdir -p "/run/init.d"
 mkdir -p "/config/enable"
 mkdir -p "/config/secure"
 mkdir -p "/usr/local/etc/docker/exec"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required files
 touch "/data/logs/start.log"
 touch "/data/logs/entrypoint.log"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # fix permissions
 chmod -f 777 "/run"
 chmod -f 777 "/tmp"
@@ -239,48 +236,40 @@ chmod -f 777 "/config/enable"
 chmod -f 777 "/config/secure"
 chmod -f 777 "/data/logs/entrypoint.log"
 chmod -f 777 "/usr/local/etc/docker/exec"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # lets ensure everyone can write to std*
 [ -f "/dev/stdin" ] && chmod -f 777 "/dev/stdin"
 [ -f "/dev/stderr" ] && chmod -f 777 "/dev/stderr"
 [ -f "/dev/stdout" ] && chmod -f 777 "/dev/stdout"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 cat <<EOF | tee /etc/profile.d/locales.shadow /etc/profile.d/locales.sh >/dev/null
 export LANG="\${LANG:-C.UTF-8}"
 export LC_ALL="\${LANG:-C.UTF-8}"
 export TZ="\${TZ:-\${TIMEZONE:-America/New_York}}"
 EOF
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the backup dir
 [ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="no"
-  touch "$ENTRYPOINT_PID_FILE"
-else
-  echo "$$" >"$ENTRYPOINT_PID_FILE"
-  # Clean any stale PID files on first run
-  rm -f /run/init.d/*.pid 2>/dev/null || true
-fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
  ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  # Show start message
  if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
-    [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for deno"
+    [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for GEN_SCRIPT_REPLACE_APPNAME"
  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set reusable variables
  { { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts"
  { { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone"
  { { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set timezone
  [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
  [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # if ipv6 add it to /etc/hosts
  if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
    echo "# known hostname mappings" >"/etc/hosts"
@@ -291,98 +280,99 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
    fi
  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # add .internal domain
  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
    __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
    __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts"
  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # add domainname
  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
    __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set containers hostname
  [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  if [ -f "/etc/hostname" ]; then
    [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
    export HOSTNAME
  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # import hosts file into container
  [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # import resolv.conf file into container
  [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
  if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
    [ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/"
  fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Delete any .gitkeep files
 [ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
 [ -d "/config" ] && rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep
 [ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Setup bin directory - /config/bin > /usr/local/bin
 __initialize_custom_bin_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Copy default system configs - /usr/local/share/template-files/defaults > /config/
 __initialize_default_templates
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Copy custom config files - /usr/local/share/template-files/config > /config/
 __initialize_config_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Copy custom data files - /usr/local/share/template-files/data > /data/
 __initialize_data_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_ssl_certs
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
  ENTRYPOINT_FIRST_RUN="no"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/config" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Check if this is a new container
 if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
  DATA_DIR_INITIALIZED="yes"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/data" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
  CONFIG_DIR_INITIALIZED="yes"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/config" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  # setup the smtp server
  __setup_mta
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # if no pid assume container restart - clean stale files on restart
-if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="yes"
-  # Clean stale pid files from previous container runs
+if [ -f "$ENTRYPOINT_PID_FILE" ]; then
+  START_SERVICES="no"
+  touch "$ENTRYPOINT_PID_FILE"
+else
+  START_SERVICES=yes
+  # Clean any stale PID files on first run
  rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
-elif [ ! -f "/run/__start_init_scripts.pid" ]; then
-  START_SERVICES="yes"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "Container ip address is:" "$CONTAINER_IP4_ADDRESS"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+[ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show configured listing processes
 if [ "$ENTRYPOINT_MESSAGE" = "yes" ] && [ -n "$ENV_PORTS" ]; then
  show_port=""
@@ -390,34 +380,42 @@ if [ "$ENTRYPOINT_MESSAGE" = "yes" ] && [ -n "$ENV_PORTS" ]; then
  __printf_space "40" "The following ports are open:" "$show_port"
  unset port show_port
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # execute init script
 if [ -f "/tmp/init" ]; then sh "/tmp/init"; fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # create user if needed
 __create_service_user "$SERVICE_USER" "$SERVICE_GROUP" "${WORK_DIR:-/home/$SERVICE_USER}" "${SERVICE_UID:-}" "${SERVICE_GID:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Modify user if needed
 __set_user_group_id $SERVICE_USER ${SERVICE_UID:-} ${SERVICE_GID:-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show message
 __run_message
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Just start services
 START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Start all services if no pidfile
-if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ] && [ "$1" != "cron" ] && [ "$1" != "tail" ] && [ "$1" != "logs" ] && [ "$1" != "cron" ]; then
-  [ "$1" = "start" ] && shift 1
-  [ "$1" = "all" ] && shift 1
-  [ "$1" = "init" ] && export CONTAINER_INIT="yes"
-  echo "$$" >"$ENTRYPOINT_PID_FILE"
-  rm -Rf "/run"/*/*pid
-  __start_init_scripts "/usr/local/etc/docker/init.d"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Determine if we should start services based on command
+# Only skip service start for the 'init' command
+SKIP_SERVICE_START="no"
+[ "$1" = "init" ] && SKIP_SERVICE_START="yes" && CONTAINER_INIT="yes"
+[ "$2" = "init" ] && SKIP_SERVICE_START="yes" && CONTAINER_INIT="yes"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Start all services if no pidfile and not skipping
+if [ "$START_SERVICES" = "yes" ] || [ -z "$1" ]; then
+  if [ "$SKIP_SERVICE_START" = "no" ]; then
+    [ "$1" = "start" ] && shift 1
+    [ "$1" = "all" ] && shift 1
+    rm -Rf "/run"/*/*pid 2>/dev/null || true
+    echo "$$" >"$ENTRYPOINT_PID_FILE"
+    __start_init_scripts "/usr/local/etc/docker/init.d"
+    CONTAINER_INIT="${CONTAINER_INIT:-no}"
+  fi
  START_SERVICES="no"
-  CONTAINER_INIT="${CONTAINER_INIT:-no}"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+export START_SERVICES CONTAINER_INIT ENTRYPOINT_PID_FILE
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Begin options
 case "$1" in
 init)
@@ -477,50 +475,57 @@ backup)
  ;;
 # Docker healthcheck
 healthcheck)
-  arguments="$*"
-  healthStatus=0
-  healthEnabled="${HEALTH_ENABLED:-}"
-  healthPorts="${WEB_SERVER_PORTS:-}"
-  healthEndPoints="${HEALTH_ENDPOINTS:-}"
-  SERVICES_LIST="${arguments:-$SERVICES_LIST}"
-  services="$(echo "${SERVICES_LIST//,/ }")"
-  healthMessage="Everything seems to be running"
-  [ "$healthEnabled" = "yes" ] || exit 0
-  if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
-    for service in /run/healthcheck/*; do
-      name=$(basename -- $service)
-      services+="$name "
+  shift 1
+  case "$1" in
+  init | test)
+    exit 0
+    ;;
+  *)
+    arguments="$*"
+    healthStatus=0
+    healthEnabled="${HEALTH_ENABLED:-}"
+    healthPorts="${WEB_SERVER_PORTS:-}"
+    healthEndPoints="${HEALTH_ENDPOINTS:-}"
+    SERVICES_LIST="${arguments:-$SERVICES_LIST}"
+    services="$(echo "${SERVICES_LIST//,/ }")"
+    healthMessage="Everything seems to be running"
+    [ "$healthEnabled" = "yes" ] || exit 0
+    if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
+      for service in /run/healthcheck/*; do
+        name=$(basename -- $service)
+        services+="$name "
+      done
+    fi
+    services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
+    for proc in $services; do
+      if [ -n "$proc" ]; then
+        if ! __pgrep "$proc"; then
+          echo "$proc is not running" >&2
+          healthStatus=$((healthStatus + 1))
+        fi
+      fi
    done
-  fi
-  services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
-  { [ "$1" = "init" ] || [ "$1" = "test" ]; } && exit 0
-  for proc in $services; do
-    if [ -n "$proc" ]; then
-      if ! __pgrep "$proc"; then
-        echo "$proc is not running" >&2
-        healthStatus=$((healthStatus + 1))
+    for port in $ports; do
+      if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
+        if ! netstat -taupln | grep -q ":$port "; then
+          echo "$port isn't open" >&2
+          healthStatus=$((healthStatus + 1))
+        fi
      fi
-    fi
-  done
-  for port in $ports; do
-    if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
-      if ! netstat -taupln | grep -q ":$port "; then
-        echo "$port isn't open" >&2
-        healthStatus=$((healthStatus + 1))
+    done
+    for endpoint in $healthEndPoints; do
+      if [ -n "$endpoint" ]; then
+        if ! __curl "$endpoint"; then
+          echo "Can not connect to $endpoint" >&2
+          healthStatus=$((healthStatus + 1))
+        fi
      fi
-    fi
-  done
-  for endpoint in $healthEndPoints; do
-    if [ -n "$endpoint" ]; then
-      if ! __curl "$endpoint"; then
-        echo "Can not connect to $endpoint" >&2
-        healthStatus=$((healthStatus + 1))
-      fi
-    fi
-  done
-  [ "$healthStatus" -eq 0 ] || healthMessage="Errors reported see: docker logs --follow $CONTAINER_NAME"
-  [ -n "$healthMessage" ] && echo "$healthMessage"
-  exit $healthStatus
+    done
+    [ "$healthStatus" -eq 0 ] || healthMessage="Errors reported see: docker logs --follow $CONTAINER_NAME"
+    [ -n "$healthMessage" ] && echo "$healthMessage"
+    exit $healthStatus
+    ;;
+  esac
  ;;
  # show open ports
 ports)
@@ -603,8 +608,8 @@ start)
  exit $?
  ;;
 esac
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # end of entrypoint
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -

 # ex: ts=2 sw=2 et filetype=sh
--- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh
+++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh