From 0af1ebad2e0aa41185ae3d3c287ff44f84940adc Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Wed, 4 Sep 2024 14:33:51 -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.10.yaml
.gitea/workflows/docker.11.yaml
.gitea/workflows/docker.12.yaml
.gitea/workflows/docker.13.yaml
.gitea/workflows/docker.yaml
---
 .gitea/workflows/docker.10.yaml | 14 +++++++++-----
 .gitea/workflows/docker.11.yaml | 14 +++++++++-----
 .gitea/workflows/docker.12.yaml | 14 +++++++++-----
 .gitea/workflows/docker.13.yaml | 14 +++++++++-----
 .gitea/workflows/docker.yaml    | 10 +++++++---
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/docker.10.yaml b/.gitea/workflows/docker.10.yaml
index 2631137..329768a 100644
--- a/.gitea/workflows/docker.10.yaml
+++ b/.gitea/workflows/docker.10.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 10
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=10 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=buster >> $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 }}:buster
             ${{ 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 b7ba044..0dc42fe 100644
--- a/.gitea/workflows/docker.11.yaml
+++ b/.gitea/workflows/docker.11.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 11
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=11 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=bullseye >> $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 }}:bullseye
             ${{ 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 09abca1..7443cb4 100644
--- a/.gitea/workflows/docker.12.yaml
+++ b/.gitea/workflows/docker.12.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 10
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=12 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=bookworm >> $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 }}:bookworm
             ${{ 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 08d640d..760a6f0 100644
--- a/.gitea/workflows/docker.13.yaml
+++ b/.gitea/workflows/docker.13.yaml
@@ -18,12 +18,16 @@ jobs:
 
       - name: Get Meta
         id: meta
+        env:
+          TAG: 13
+          ORG: ${{ vars.DOCKER_ORG }}
+          HUB: ${{ vars.DOCKER_HUB }}
         run: |
-          echo DOCKER_TAG=13 >> $GITHUB_OUTPUT
-          echo DOCKER_TAG_NAME=trixie >> $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 }}:trixie
             ${{ 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