From 002d298bec22e8b3fecdd8100a648f94233928ed Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Wed, 4 Sep 2024 14:34:00 -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

.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
---
 .gitea/workflows/docker.19.04.yaml | 14 +++++++++-----
 .gitea/workflows/docker.20.04.yaml | 14 +++++++++-----
 .gitea/workflows/docker.21.04.yaml | 14 +++++++++-----
 .gitea/workflows/docker.22.04.yaml | 14 +++++++++-----
 .gitea/workflows/docker.23.04.yaml | 15 +++++++++------
 .gitea/workflows/docker.23.10.yaml | 14 +++++++++-----
 .gitea/workflows/docker.24.04.yaml |  2 +-
 .gitea/workflows/docker.24.10.yaml | 14 +++++++++-----
 .gitea/workflows/docker.yaml       | 10 +++++++---
 9 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/.gitea/workflows/docker.19.04.yaml b/.gitea/workflows/docker.19.04.yaml
index 857878e..1d8dd5a 100644
--- a/.gitea/workflows/docker.19.04.yaml
+++ b/.gitea/workflows/docker.19.04.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 19.04
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=19.04 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=disco >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "19/04") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:disco
             ${{ 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 d4acbca..61878a0 100644
--- a/.gitea/workflows/docker.20.04.yaml
+++ b/.gitea/workflows/docker.20.04.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 20.04
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=20.04 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=focal >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "20.04") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:focal
             ${{ 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 0d0ffee..9653448 100644
--- a/.gitea/workflows/docker.21.04.yaml
+++ b/.gitea/workflows/docker.21.04.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 21.04
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=21.04 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=hirsute >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "21.04") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:hirsute
             ${{ 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 1912092..708a0fb 100644
--- a/.gitea/workflows/docker.22.04.yaml
+++ b/.gitea/workflows/docker.22.04.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 22.04
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=22.04 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=jammy >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "22.04") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:jammy
             ${{ 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 55bf93f..5e71a3f 100644
--- a/.gitea/workflows/docker.23.04.yaml
+++ b/.gitea/workflows/docker.23.04.yaml
@@ -17,13 +17,16 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Get Meta
-        id: meta
+        env:
+          TAG: 9
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=23.04 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=lunar >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "9") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +49,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 }}:lunar
             ${{ 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 460bbc9..4b7d5ff 100644
--- a/.gitea/workflows/docker.23.10.yaml
+++ b/.gitea/workflows/docker.23.10.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 23.10
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=23.10 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=mantic >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "23.10") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:mantic
             ${{ 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 2f9c71a..aae1d9c 100644
--- a/.gitea/workflows/docker.24.04.yaml
+++ b/.gitea/workflows/docker.24.04.yaml
@@ -46,5 +46,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 }}:noble
             ${{ 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 30b5927..eb97b73 100644
--- a/.gitea/workflows/docker.24.10.yaml
+++ b/.gitea/workflows/docker.24.10.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 24.10
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=24.10 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=oracular >> $GITHUB_OUTPUT
+          echo DATE_TAG=$(date +'%y%m') >> $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 DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "19/04") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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
@@ -46,5 +50,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 }}:oracular
             ${{ 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 e161f43..a8171fd 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          ORG: ${{ vars.DOCKER_ORG }}
+          TAG: ${{ vars.DOCKER_TAG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
           echo DATE_TAG=$(date +'%y%m') >> $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 "latest") >> $GITHUB_OUTPUT
-          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$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