From 7f2f4413b1f1a6a05a3b884de701ac9ce48dcacd Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 10:52:28 -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.18.04 Dockerfile.19.04 Dockerfile.20.04 Dockerfile.21.04 Dockerfile.22.04 Dockerfile.23.04 Dockerfile.23.10 Dockerfile.24.04 Dockerfile.24.10 .env.scripts .env.scripts.18.04 .env.scripts.19.04 .env.scripts.20.04 .env.scripts.21.04 .env.scripts.22.04 .env.scripts.23.04 .env.scripts.23.10 .env.scripts.24.04 .env.scripts.24.10 .gitea/workflows/docker.18.04.yaml .gitea/workflows/docker.19.04.yaml .gitea/workflows/docker.20.04.yaml .gitea/workflows/docker.21.04.yaml .gitea/workflows/docker.22.04.yaml .gitea/workflows/docker.23.04.yaml .gitea/workflows/docker.23.10.yaml .gitea/workflows/docker.24.04.yaml .gitea/workflows/docker.24.10.yaml .gitea/workflows/docker.yaml --- .env.scripts | 4 ++-- .env.scripts.18.04 | 4 ++-- .env.scripts.19.04 | 4 ++-- .env.scripts.20.04 | 4 ++-- .env.scripts.21.04 | 4 ++-- .env.scripts.22.04 | 4 ++-- .env.scripts.23.04 | 4 ++-- .env.scripts.23.10 | 4 ++-- .env.scripts.24.04 | 4 ++-- .env.scripts.24.10 | 4 ++-- .gitea/workflows/docker.18.04.yaml | 4 +++- .gitea/workflows/docker.19.04.yaml | 4 +++- .gitea/workflows/docker.20.04.yaml | 6 ++++-- .gitea/workflows/docker.21.04.yaml | 4 +++- .gitea/workflows/docker.22.04.yaml | 4 +++- .gitea/workflows/docker.23.04.yaml | 4 +++- .gitea/workflows/docker.23.10.yaml | 4 +++- .gitea/workflows/docker.24.04.yaml | 4 +++- .gitea/workflows/docker.24.10.yaml | 4 +++- .gitea/workflows/docker.yaml | 2 ++ Dockerfile | 6 +++--- Dockerfile.18.04 | 2 +- Dockerfile.19.04 | 2 +- Dockerfile.20.04 | 2 +- Dockerfile.21.04 | 2 +- Dockerfile.22.04 | 2 +- Dockerfile.23.04 | 2 +- Dockerfile.23.10 | 2 +- Dockerfile.24.04 | 2 +- Dockerfile.24.10 | 2 +- 30 files changed, 62 insertions(+), 42 deletions(-) diff --git a/.env.scripts b/.env.scripts index 97d7531..42c5d56 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:11 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:09 AM EDT 2024 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.18.04 b/.env.scripts.18.04 index 90d0796..45511e9 100644 --- a/.env.scripts.18.04 +++ b/.env.scripts.18.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:12 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:10 AM EDT 2024 # @@File : .env.scripts.18.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.19.04 b/.env.scripts.19.04 index 5a935e4..a72b7b4 100644 --- a/.env.scripts.19.04 +++ b/.env.scripts.19.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:12 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:10 AM EDT 2024 # @@File : .env.scripts.19.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.20.04 b/.env.scripts.20.04 index 0b2d8b1..3b2b70c 100644 --- a/.env.scripts.20.04 +++ b/.env.scripts.20.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:12 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:10 AM EDT 2024 # @@File : .env.scripts.20.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.21.04 b/.env.scripts.21.04 index 6791c4a..15a2ed3 100644 --- a/.env.scripts.21.04 +++ b/.env.scripts.21.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:13 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:11 AM EDT 2024 # @@File : .env.scripts.21.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.22.04 b/.env.scripts.22.04 index c60acaa..a86ef61 100644 --- a/.env.scripts.22.04 +++ b/.env.scripts.22.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:13 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:11 AM EDT 2024 # @@File : .env.scripts.22.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.23.04 b/.env.scripts.23.04 index fdc944d..b6e6494 100644 --- a/.env.scripts.23.04 +++ b/.env.scripts.23.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:13 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:11 AM EDT 2024 # @@File : .env.scripts.23.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.23.10 b/.env.scripts.23.10 index 11074fa..3f20266 100644 --- a/.env.scripts.23.10 +++ b/.env.scripts.23.10 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:14 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:12 AM EDT 2024 # @@File : .env.scripts.23.10 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.24.04 b/.env.scripts.24.04 index e4602f1..b9b2ff9 100644 --- a/.env.scripts.24.04 +++ b/.env.scripts.24.04 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:14 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:12 AM EDT 2024 # @@File : .env.scripts.24.04 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.24.10 b/.env.scripts.24.10 index a4dd012..45d01e4 100644 --- a/.env.scripts.24.10 +++ b/.env.scripts.24.10 @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408111008-git +##@Version : 202408111051-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:08:14 AM EDT 2024 +# @@Created : Sun Aug 11 10:51:12 AM EDT 2024 # @@File : .env.scripts.24.10 # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitea/workflows/docker.18.04.yaml b/.gitea/workflows/docker.18.04.yaml index 1a5601c..d430f77 100644 --- a/.gitea/workflows/docker.18.04.yaml +++ b/.gitea/workflows/docker.18.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=18.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=bionic >> $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 "18.04") >> $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.19.04.yaml b/.gitea/workflows/docker.19.04.yaml index 5d2c833..a1f63f2 100644 --- a/.gitea/workflows/docker.19.04.yaml +++ b/.gitea/workflows/docker.19.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=19.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=disco >> $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 "19.04") >> $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.20.04.yaml b/.gitea/workflows/docker.20.04.yaml index eb64544..ce95834 100644 --- a/.gitea/workflows/docker.20.04.yaml +++ b/.gitea/workflows/docker.20.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=20.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=focal >> $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 "20.04") >> $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" @@ -40,10 +41,11 @@ jobs: uses: docker/build-push-action@v4 with: context: . - file: ./Dockerfile.20.04 + file: ./Dockerfile.21.04 platforms: | linux/amd64 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.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.21.04.yaml b/.gitea/workflows/docker.21.04.yaml index 8b5058d..caccdf0 100644 --- a/.gitea/workflows/docker.21.04.yaml +++ b/.gitea/workflows/docker.21.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=21.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=hirsute >> $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 "21.04") >> $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.22.04.yaml b/.gitea/workflows/docker.22.04.yaml index 29eb63d..4243d1e 100644 --- a/.gitea/workflows/docker.22.04.yaml +++ b/.gitea/workflows/docker.22.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=22.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=jammy >> $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 "22.04") >> $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.23.04.yaml b/.gitea/workflows/docker.23.04.yaml index a2c9ac1..ec30938 100644 --- a/.gitea/workflows/docker.23.04.yaml +++ b/.gitea/workflows/docker.23.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=23.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=lunar >> $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 "23.04") >> $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.23.10.yaml b/.gitea/workflows/docker.23.10.yaml index 262a3dc..e3bd603 100644 --- a/.gitea/workflows/docker.23.10.yaml +++ b/.gitea/workflows/docker.23.10.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=23.10 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=mantic >> $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 "23.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.24.04.yaml b/.gitea/workflows/docker.24.04.yaml index 1f578d5..1ce124c 100644 --- a/.gitea/workflows/docker.24.04.yaml +++ b/.gitea/workflows/docker.24.04.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=24.04 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=noble >> $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 "24.04") >> $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.24.10.yaml b/.gitea/workflows/docker.24.10.yaml index d0b5104..c1a674a 100644 --- a/.gitea/workflows/docker.24.10.yaml +++ b/.gitea/workflows/docker.24.10.yaml @@ -19,9 +19,10 @@ jobs: - name: Get Meta id: meta run: | + echo DOCKER_TAG=24.10 >> $GITHUB_OUTPUT + echo DOCKER_TAG_NAME=oracular >> $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 "24.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.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 d9c7053..b0c32cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:11 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:09 AM EDT 2024" 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.18.04 b/Dockerfile.18.04 index e4fa6be..52038c3 100644 --- a/Dockerfile.18.04 +++ b/Dockerfile.18.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:12 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:10 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.19.04 b/Dockerfile.19.04 index 361d2f8..b1a29ee 100644 --- a/Dockerfile.19.04 +++ b/Dockerfile.19.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:12 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:10 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.20.04 b/Dockerfile.20.04 index 0a62f91..0cbddee 100644 --- a/Dockerfile.20.04 +++ b/Dockerfile.20.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:12 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:10 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.21.04 b/Dockerfile.21.04 index ddcf600..0bce434 100644 --- a/Dockerfile.21.04 +++ b/Dockerfile.21.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:13 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:11 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.22.04 b/Dockerfile.22.04 index f467b8e..37bed5d 100644 --- a/Dockerfile.22.04 +++ b/Dockerfile.22.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:13 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:11 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.23.04 b/Dockerfile.23.04 index 92aa6ce..8b12fa2 100644 --- a/Dockerfile.23.04 +++ b/Dockerfile.23.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:13 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:11 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.23.10 b/Dockerfile.23.10 index e36581d..dd29fec 100644 --- a/Dockerfile.23.10 +++ b/Dockerfile.23.10 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:14 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:12 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.24.04 b/Dockerfile.24.04 index fda9d0c..6af8f9a 100644 --- a/Dockerfile.24.04 +++ b/Dockerfile.24.04 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:14 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:12 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default" diff --git a/Dockerfile.24.10 b/Dockerfile.24.10 index fac063f..1d51599 100644 --- a/Dockerfile.24.10 +++ b/Dockerfile.24.10 @@ -2,7 +2,7 @@ # Docker image for ubuntu using the ubuntu template ARG IMAGE_NAME="ubuntu" ARG PHP_SERVER="ubuntu" -ARG BUILD_DATE="Sun Aug 11 10:08:14 AM EDT 2024" +ARG BUILD_DATE="Sun Aug 11 10:51:12 AM EDT 2024" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/share/httpd/default"