From 64c4a41cd009ae88cf57298db8e54d8956aef658 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 4 Feb 2025 09:26:43 -0500
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.yaml
---
 .gitea/workflows/docker.yaml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 5e07ac4..50518eb 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -4,7 +4,7 @@ on: push
 
 jobs:
   release-image:
-    runs-on: act_runner
+    runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
     env:
@@ -18,17 +18,13 @@ jobs:
 
       - name: Get Meta
         id: meta
-        env:
-          ORG: casjaysdevdocker
-          TAG: ${{ vars.DOCKER_TAG }}
-          HUB: docker.io
         run: |
-          echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT
           echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-          echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "latest") >> $GITHUB_OUTPUT
-          echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT
-          echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdevdocker") >> $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 REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
@@ -50,5 +46,4 @@ 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 }}