From 13f4ad3b94ce51dfab0be6196316dd3e465fb9ba Mon Sep 17 00:00:00 2001
From: ztimson <zaktimson@gmail.com>
Date: Fri, 1 May 2026 11:13:15 -0400
Subject: [PATCH] Update build steps

---
 .github/workflows/build.yaml | 45 +++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6fca670..189dcac 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -43,11 +43,40 @@ jobs:
               with:
                   tag: ${{env.VERSION}}
 
-    publish:
-        name: Build & Push Dockerfile
-        needs: build
-        uses: ztimson/actions/.github/workflows/docker.yaml@develop
-        with:
-            name: ztimson/zakscode
-            repository: ${{github.server_url}}/${{github.repository}}.git
-            pass: ${{secrets.DEPLOY_TOKEN}}
+    container:
+        name: Build Container
+        runs-on: ubuntu-latest
+        container: docker
+        steps:
+            -   name: Build Container
+                run: |
+                    git clone -b "${{github.ref_name}}" "$(echo ${{github.server_url}}/${{github.repository}}.git | sed s%://%://${{github.token}}@% )" .
+                    DOCKER_HUB=$([ -n "${{secrets.DOCKER_HUB_USER}}" ] && [ -n "${{secrets.DOCKER_HUB_TOKEN}}" ] && [ -n "${{secrets.DOCKER_HUB_IMAGE}}" ] && echo "true" || echo "false")
+                    REGISTRY="$(echo "${{github.server_url}}" | sed -E 's|https?://||')"
+                    VERSION=$(cat package.json | grep version | grep -Eo '[0-9][[:alnum:]\.\/\-]+')
+
+                    docker login -u "${{github.repository_owner}}" -p "${{secrets.DEPLOY_TOKEN}}" "$REGISTRY"
+                    if [ "$DOCKER_HUB" = "true" ]; then docker login -u "${{secrets.DOCKER_HUB_USER}}" -p "${{secrets.DOCKER_HUB_TOKEN}}" docker.io; fi
+
+                    docker build -t "$REGISTRY/${{github.repository}}:${{github.ref_name}}" .
+                    docker push "$REGISTRY/${{github.repository}}:${{github.ref_name}}"
+                    if [ "$DOCKER_HUB" = "true" ]; then
+                      docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}"
+                      docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}"
+                    fi
+
+                    if [ "${{github.ref_name}}" = "master" ]; then
+                      docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:$VERSION"
+                      docker push "$REGISTRY/${{github.repository}}:$VERSION"
+                      if [ "$DOCKER_HUB" = "true" ]; then
+                        docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION"
+                        docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION"
+                      fi
+
+                      docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest"
+                      docker push "$REGISTRY/${{github.repository}}:latest"
+                      if [ "$DOCKER_HUB" = "true" ]; then
+                        docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest"
+                        docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest"
+                      fi
+                    fi