From f3237c61711875cb980d5dfe20bceeebfbf04c62 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Sat, 19 Jul 2025 16:40:28 -0400
Subject: [PATCH] throwing in the towel v2

---
 .github/workflows/build.yaml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 904d6f6..873dc18 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ on:
 
 env:
   REGISTRY: scm.wyattjmiller.com
-  USERNAME: ${{ secrets.GH_ACTION_USERNAME }}
+  USERNAME: wymiller # Define username here to use consistently
 
 jobs:
   build-and-push:
@@ -17,7 +17,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-
     strategy:
       matrix:
         include:
@@ -30,7 +29,6 @@ jobs:
           - dockerfile: Dockerfile
             image: my-website-v2_frontend
             context: ./frontend
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -42,7 +40,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.GH_ACTION_USERNAME }}
+          username: ${{ env.USERNAME }}
           password: ${{ secrets.GH_ACTION_TOKEN }}
 
       - name: Extract metadata
@@ -64,7 +62,7 @@ jobs:
           context: ${{ matrix.context }}
           file: ${{ matrix.context }}/${{ matrix.dockerfile }}
           push: true
-          tags: scm.wyattjmiller.com/wymiller/${{ matrix.image }}
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -76,7 +74,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -93,15 +90,16 @@ jobs:
 
             The following Docker images have been built and pushed to the container registry:
 
-            - `${{ env.REGISTRY }}/wymiller/mywebsite-public:${{ github.ref_name }}`
-            - `${{ env.REGISTRY }}/wymiller/mywebsite-task:${{ github.ref_name }}`
-            - `${{ env.REGISTRY }}/wymiller/mywebsite-frontend:${{ github.ref_name }}`
+            - `${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_public:${{ github.ref_name }}`
+            - `${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_task:${{ github.ref_name }}`
+            - `${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_frontend:${{ github.ref_name }}`
 
             ### Usage
+
             ```bash
-            docker pull ${{ env.REGISTRY }}/wymiller/mywebsite-public:${{ github.ref_name }}
-            docker pull ${{ env.REGISTRY }}/wymiller/mywebsite-task:${{ github.ref_name }}
-            docker pull ${{ env.REGISTRY }}/wymiller/mywebsite-frontend:${{ github.ref_name }}
+            docker pull ${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_public:${{ github.ref_name }}
+            docker pull ${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_task:${{ github.ref_name }}
+            docker pull ${{ env.REGISTRY }}/${{ env.USERNAME }}/my-website-v2_frontend:${{ github.ref_name }}
             ```
           draft: false
           prerelease: false