From 437bd7783c33ad0ee299bbfc0c1137ca69e19951 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 10:52:15 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile 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 --- .env.scripts | 4 ++-- .env.scripts.10 | 4 ++-- .env.scripts.11 | 4 ++-- .env.scripts.12 | 4 ++-- .env.scripts.13 | 4 ++-- .gitea/workflows/docker.10.yaml | 4 +++- .gitea/workflows/docker.11.yaml | 4 +++- .gitea/workflows/docker.12.yaml | 4 +++- .gitea/workflows/docker.13.yaml | 4 +++- .gitea/workflows/docker.yaml | 2 ++ Dockerfile | 6 +++--- Dockerfile.10 | 6 +++--- Dockerfile.11 | 2 +- Dockerfile.12 | 2 +- Dockerfile.13 | 2 +- 15 files changed, 33 insertions(+), 23 deletions(-) diff --git a/.env.scripts b/.env.scripts index 543d0a3..9f4e074 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111007-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@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 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.10 b/.env.scripts.10 index 6ba250e..8043c3b 100644 --- a/.env.scripts.10 +++ b/.env.scripts.10 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111007-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@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 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.11 b/.env.scripts.11 index 6bad274..8ad21fb 100644 --- a/.env.scripts.11 +++ b/.env.scripts.11 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111007-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@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 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.12 b/.env.scripts.12 index d1fa51b..6c7a587 100644 --- a/.env.scripts.12 +++ b/.env.scripts.12 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111007-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@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 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.13 b/.env.scripts.13 index f8f4b1a..6249c6f 100644 --- a/.env.scripts.13 +++ b/.env.scripts.13 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111007-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@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 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitea/workflows/docker.10.yaml b/.gitea/workflows/docker.10.yaml index ef3e24f..1ffffab 100644 --- 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 }} diff --git a/.gitea/workflows/docker.11.yaml b/.gitea/workflows/docker.11.yaml index dd10d4c..f5fcc4d 100644 --- 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 }} diff --git a/.gitea/workflows/docker.12.yaml b/.gitea/workflows/docker.12.yaml index 49538d4..a4e8a8c 100644 --- 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 }} diff --git a/.gitea/workflows/docker.13.yaml b/.gitea/workflows/docker.13.yaml index 873bae6..b887344 100644 --- 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 }} diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index d74ab55..4e1aae0 100644 --- 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 }} diff --git a/Dockerfile b/Dockerfile index afac831..c207ba4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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; \ diff --git a/Dockerfile.10 b/Dockerfile.10 index a923f3a..969c07d 100644 --- 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; \ diff --git a/Dockerfile.11 b/Dockerfile.11 index 56c2ab1..3d4194a 100644 --- 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" diff --git a/Dockerfile.12 b/Dockerfile.12 index 5cbe172..13b5bc6 100644 --- 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" diff --git a/Dockerfile.13 b/Dockerfile.13 index cebb844..8364c75 100644 --- 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"