🗃️ Committing everything that changed 🗃️

Dockerfile Dockerfile.10 Dockerfile.11 Dockerfile.12 Dockerfile.13 .env.scripts .env.scripts.10 .env.scripts.11 .env.scripts.12 .env.scripts.13 .gitea/workflows/docker.10.yaml .gitea/workflows/docker.11.yaml .gitea/workflows/docker.12.yaml .gitea/workflows/docker.13.yaml .gitea/workflows/docker.yaml
2024-11-21 11:23:06 -05:00 · 2024-08-11 10:52:15 -04:00 · 2024-08-11 10:52:15 -04:00 · 437bd7783c
commit 437bd7783c
parent 469be0c811
15 changed files with 33 additions and 23 deletions
--- a/.env.scripts
+++ b/.env.scripts
@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408111007-git
+##@Version           :  202408111051-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2024 CasjaysDev
-# @@Created          :  Sun Aug 11 10:07:35 AM EDT 2024
+# @@Created          :  Sun Aug 11 10:51:02 AM EDT 2024
 # @@File             :  .env.scripts
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.10
+++ b/.env.scripts.10
@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408111007-git
+##@Version           :  202408111051-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2024 CasjaysDev
-# @@Created          :  Sun Aug 11 10:07:36 AM EDT 2024
+# @@Created          :  Sun Aug 11 10:51:02 AM EDT 2024
 # @@File             :  .env.scripts.10
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.11
+++ b/.env.scripts.11
@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408111007-git
+##@Version           :  202408111051-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2024 CasjaysDev
-# @@Created          :  Sun Aug 11 10:07:36 AM EDT 2024
+# @@Created          :  Sun Aug 11 10:51:03 AM EDT 2024
 # @@File             :  .env.scripts.11
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.12
+++ b/.env.scripts.12
@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408111007-git
+##@Version           :  202408111051-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2024 CasjaysDev
-# @@Created          :  Sun Aug 11 10:07:36 AM EDT 2024
+# @@Created          :  Sun Aug 11 10:51:03 AM EDT 2024
 # @@File             :  .env.scripts.12
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.env.scripts.13
+++ b/.env.scripts.13
@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408111007-git
+##@Version           :  202408111051-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
 # @@Copyright        :  Copyright 2024 CasjaysDev
-# @@Created          :  Sun Aug 11 10:07:37 AM EDT 2024
+# @@Created          :  Sun Aug 11 10:51:03 AM EDT 2024
 # @@File             :  .env.scripts.13
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/.gitea/workflows/docker.10.yaml
+++ b/.gitea/workflows/docker.10.yaml
@ -19,9 +19,10 @@ jobs:
      - name: Get Meta
        id: meta
        run: |
+          echo DOCKER_TAG=10 >> $GITHUB_OUTPUT
+          echo DOCKER_TAG_NAME=buster >> $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_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "10") >> $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
          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
@ -47,3 +48,4 @@ jobs:
          push: true
          tags: | # replace it with your local IP and tags
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG_NAME }}
--- a/.gitea/workflows/docker.11.yaml
+++ b/.gitea/workflows/docker.11.yaml
@ -19,9 +19,10 @@ jobs:
      - name: Get Meta
        id: meta
        run: |
+          echo DOCKER_TAG=11 >> $GITHUB_OUTPUT
+          echo DOCKER_TAG_NAME=bullseye >> $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_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "11") >> $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
          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
@ -47,3 +48,4 @@ jobs:
          push: true
          tags: | # replace it with your local IP and tags
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG_NAME }}
--- a/.gitea/workflows/docker.12.yaml
+++ b/.gitea/workflows/docker.12.yaml
@ -19,9 +19,10 @@ jobs:
      - name: Get Meta
        id: meta
        run: |
+          echo DOCKER_TAG=12 >> $GITHUB_OUTPUT
+          echo DOCKER_TAG_NAME=bookworm >> $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_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "12") >> $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
          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
@ -47,3 +48,4 @@ jobs:
          push: true
          tags: | # replace it with your local IP and tags
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG_NAME }}
--- a/.gitea/workflows/docker.13.yaml
+++ b/.gitea/workflows/docker.13.yaml
@ -19,9 +19,10 @@ jobs:
      - name: Get Meta
        id: meta
        run: |
+          echo DOCKER_TAG=13 >> $GITHUB_OUTPUT
+          echo DOCKER_TAG_NAME=trixie >> $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_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "13") >> $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
          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
@ -47,3 +48,4 @@ jobs:
          push: true
          tags: | # replace it with your local IP and tags
            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG_NAME }}
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@ -19,6 +19,7 @@ jobs:
      - name: Get Meta
        id: meta
        run: |
+          echo DATE_TAG=$(date +'%y%m') 
          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_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
@ -46,4 +47,5 @@ jobs:
            linux/arm64
          push: true
          tags: | # replace it with your local IP and 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/6
+++ b/6
@ -2,7 +2,7 @@
 # Docker image for debian using the debian template
 ARG IMAGE_NAME="debian"
 ARG PHP_SERVER="debian"
-ARG BUILD_DATE="202408111007"
+ARG BUILD_DATE="202408111051"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/share/httpd/default"
@ -140,7 +140,7 @@ RUN echo "Updating system files "; \

 RUN echo "Custom Settings"; \
  $SHELL_OPTS; \
-  echo ""
+echo ""

 RUN echo "Setting up users and scripts "; \
  $SHELL_OPTS; \
@ -157,7 +157,7 @@ RUN echo "Setting OS Settings "; \

 RUN echo "Custom Applications"; \
  $SHELL_OPTS; \
-  echo ""
+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" && exit 10; };echo "Done running the custom script";fi; \
--- a/Dockerfile.10
+++ b/Dockerfile.10
@ -2,7 +2,7 @@
 # Docker image for debian using the debian template
 ARG IMAGE_NAME="debian"
 ARG PHP_SERVER="debian"
-ARG BUILD_DATE="202408111007"
+ARG BUILD_DATE="202408111051"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/share/httpd/default"
@ -140,7 +140,7 @@ RUN echo "Updating system files "; \

 RUN echo "Custom Settings"; \
  $SHELL_OPTS; \
-  echo ""
+echo ""

 RUN echo "Setting up users and scripts "; \
  $SHELL_OPTS; \
@ -157,7 +157,7 @@ RUN echo "Setting OS Settings "; \

 RUN echo "Custom Applications"; \
  $SHELL_OPTS; \
-  echo ""
+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" && exit 10; };echo "Done running the custom script";fi; \
--- a/Dockerfile.11
+++ b/Dockerfile.11
@ -2,7 +2,7 @@
 # Docker image for debian using the debian template
 ARG IMAGE_NAME="debian"
 ARG PHP_SERVER="debian"
-ARG BUILD_DATE="202408111007"
+ARG BUILD_DATE="202408111051"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/share/httpd/default"
--- a/Dockerfile.12
+++ b/Dockerfile.12
@ -2,7 +2,7 @@
 # Docker image for debian using the debian template
 ARG IMAGE_NAME="debian"
 ARG PHP_SERVER="debian"
-ARG BUILD_DATE="202408111007"
+ARG BUILD_DATE="202408111051"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/share/httpd/default"
--- a/Dockerfile.13
+++ b/Dockerfile.13
@ -2,7 +2,7 @@
 # Docker image for debian using the debian template
 ARG IMAGE_NAME="debian"
 ARG PHP_SERVER="debian"
-ARG BUILD_DATE="202408111007"
+ARG BUILD_DATE="202408111051"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/share/httpd/default"