From 60f6061ba84fae60c2314b3de65541c8ca45ae24 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 16:57:16 -0400
Subject: [PATCH 01/15] Add arm64 building potentially.

---
 .github/workflows/main.yml | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aad7bfa7..f05877ba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,20 +55,26 @@ jobs:
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
          # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio
-         -  name: Build Image
-            run: |
-               docker build -t $IMAGE_NAME .
+         -  name: Use QEMU
+            uses: docker/setup-qemu-action@master
+            with:
+             platforms: all
+              
+         - name: Set up Docker Buildx
+           id: buildx
+           uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
-            run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+            run: echo "${{ secrets.TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-         -  name: Push Image
-            run: |
-               echo IMAGE_ID=$IMAGE_ID
-               echo IMAGE_VERSION=$IMAGE_VERSION
-               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
-               # Always tag latest when pushing a tag, as we don't expect to ever merge old tags
-               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest
-               docker push $IMAGE_ID:$IMAGE_VERSION
-               docker push $IMAGE_ID:latest
+         -  name: Build and push the docker image 
+            uses: docker/build-push-action@master
+            with:
+             context: .
+             builder: ${{ steps.buildx.outputs.name }}
+             platforms: linux/arm64,linux/amd64
+             push: true
+             tags: ghcr.io/kokomo/5etools-img:latest
+             #labels: ${{ steps.meta.outputs.labels }}
+               
          # endregion

From e4085c323f9de581852bc4a5a4979d240ae9d147 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:01:04 -0400
Subject: [PATCH 02/15] Fix it up

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f05877ba..54b7a260 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,7 +65,7 @@ jobs:
            uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
-            run: echo "${{ secrets.TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+            run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
          -  name: Build and push the docker image 
             uses: docker/build-push-action@master

From 5ec8e31615b65edab34d80ecc9810b412e595913 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:05:17 -0400
Subject: [PATCH 03/15] Fix username

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54b7a260..c76c40ce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -74,7 +74,7 @@ jobs:
              builder: ${{ steps.buildx.outputs.name }}
              platforms: linux/arm64,linux/amd64
              push: true
-             tags: ghcr.io/kokomo/5etools-img:latest
+             tags: ghcr.io/kokomo123/5etools-img:latest
              #labels: ${{ steps.meta.outputs.labels }}
                
          # endregion

From 340945a77d842116b3a810e44a668582e3f85e17 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:18:32 -0400
Subject: [PATCH 04/15] See if this works..

---
 .github/workflows/main.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c76c40ce..2883225c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,14 +67,19 @@ jobs:
          -  name: Log In to Registry
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-         -  name: Build and push the docker image 
-            uses: docker/build-push-action@master
-            with:
-             context: .
-             builder: ${{ steps.buildx.outputs.name }}
-             platforms: linux/arm64,linux/amd64
-             push: true
-             tags: ghcr.io/kokomo123/5etools-img:latest
-             #labels: ${{ steps.meta.outputs.labels }}
+         -  name: Build the docker image 
+            run: |
+              docker build -t $IMAGE_NAME
+
+         -  name: Push image
+            run: |
+               echo IMAGE_ID=$IMAGE_ID
+               echo IMAGE_VERSION=$IMAGE_VERSION
+               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
+               # Always tag latest when pushing a tag, as we don't expect to ever merge old tags
+               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest
+               docker push $IMAGE_ID:$IMAGE_VERSION
+               docker push $IMAGE_ID:latest
+             
                
          # endregion

From 39c09955046f56cfd18492ad0b11ecfe8bfc6475 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:22:53 -0400
Subject: [PATCH 05/15] Forgot the dot...

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2883225c..67b094ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -69,7 +69,7 @@ jobs:
 
          -  name: Build the docker image 
             run: |
-              docker build -t $IMAGE_NAME
+              docker build -t $IMAGE_NAME .
 
          -  name: Push image
             run: |

From 4638c1af7ab8a69e4a224665e1d5a3feea87050a Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:26:54 -0400
Subject: [PATCH 06/15] Push platforms flag and see if that works..

---
 .github/workflows/main.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 67b094ed..0c564dcd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,21 +55,13 @@ jobs:
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
          # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio
-         -  name: Use QEMU
-            uses: docker/setup-qemu-action@master
-            with:
-             platforms: all
-              
-         - name: Set up Docker Buildx
-           id: buildx
-           uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
          -  name: Build the docker image 
             run: |
-              docker build -t $IMAGE_NAME .
+              docker build --platforms linux/amd64,linux/arm64 -t $IMAGE_NAME .
 
          -  name: Push image
             run: |

From b3ba187884cf461793e950244bb305d35bda99f5 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:29:53 -0400
Subject: [PATCH 07/15] Buildx please work

---
 .github/workflows/main.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0c564dcd..785bd36c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,14 +54,17 @@ jobs:
 
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
-         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio
+         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio              
+         - name: Set up Docker Buildx
+           id: buildx
+           uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
          -  name: Build the docker image 
             run: |
-              docker build --platforms linux/amd64,linux/arm64 -t $IMAGE_NAME .
+              docker build --platforms linux/amd64,linux/arm64 -t $IMAGE_NAME
 
          -  name: Push image
             run: |

From 9ae408de25e9fe69d230365058641addac824790 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:32:50 -0400
Subject: [PATCH 08/15] Typo

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 785bd36c..129b23e1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,7 +64,7 @@ jobs:
 
          -  name: Build the docker image 
             run: |
-              docker build --platforms linux/amd64,linux/arm64 -t $IMAGE_NAME
+              docker build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME
 
          -  name: Push image
             run: |

From 5048871058143743e750f8d6c146bf08b2cb9b5b Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:37:42 -0400
Subject: [PATCH 09/15] Placing platform afterwards..

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 129b23e1..453b98c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,7 +64,7 @@ jobs:
 
          -  name: Build the docker image 
             run: |
-              docker build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME
+              docker build -t $IMAGE_NAME --platform linux/amd64,linux/arm64
 
          -  name: Push image
             run: |

From 18d17209b2c903e83938d023faa7b6d6e4a261fb Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 17:44:02 -0400
Subject: [PATCH 10/15] Before the t?

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 453b98c7..d8e6aa8f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,7 +64,7 @@ jobs:
 
          -  name: Build the docker image 
             run: |
-              docker build -t $IMAGE_NAME --platform linux/amd64,linux/arm64
+              docker build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME 
 
          -  name: Push image
             run: |

From a970a6294a67257bcc3138b707c14095eabd8971 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 18:02:30 -0400
Subject: [PATCH 11/15] Fixing up for last time, with proper commands..

---
 .github/workflows/main.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d8e6aa8f..9f9142a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,7 +54,12 @@ jobs:
 
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
-         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio              
+         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio     
+         -  name: Use QEMU
+            uses: docker/setup-qemu-action@master
+            with:
+             platforms: all
+                      
          - name: Set up Docker Buildx
            id: buildx
            uses: docker/setup-buildx-action@master
@@ -63,8 +68,12 @@ jobs:
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
          -  name: Build the docker image 
-            run: |
-              docker build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME 
+            uses: docker/build-push-action@master
+            with:
+             context: .
+             builder: ${{ steps.buildx.outputs.name }}
+             platforms: linux/arm64,linux/amd64
+             push: false
 
          -  name: Push image
             run: |

From a12413fa5812ff3d3d9cdbb929ceeeda4c22c74a Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 18:19:41 -0400
Subject: [PATCH 12/15] Testing

---
 .github/workflows/main.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f9142a5..9edfd995 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,10 +80,8 @@ jobs:
                echo IMAGE_ID=$IMAGE_ID
                echo IMAGE_VERSION=$IMAGE_VERSION
                docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
-               # Always tag latest when pushing a tag, as we don't expect to ever merge old tags
-               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest
                docker push $IMAGE_ID:$IMAGE_VERSION
-               docker push $IMAGE_ID:latest
+               
              
                
          # endregion

From 3af7d71726d73d14b054c9e9b426bf950193508a Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 18:25:49 -0400
Subject: [PATCH 13/15] Push final version?

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9edfd995..40cc6bcf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
             run: |
                echo IMAGE_ID=$IMAGE_ID
                echo IMAGE_VERSION=$IMAGE_VERSION
-               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
+               docker tag $IMAGE_ID:$IMAGE_VERSION
                docker push $IMAGE_ID:$IMAGE_VERSION
                
              

From 713b56d4e22f52d3200bd4a6345c2082df6ad603 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 18:53:20 -0400
Subject: [PATCH 14/15] Final version of fixing the push command

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 40cc6bcf..9edfd995 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
             run: |
                echo IMAGE_ID=$IMAGE_ID
                echo IMAGE_VERSION=$IMAGE_VERSION
-               docker tag $IMAGE_ID:$IMAGE_VERSION
+               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
                docker push $IMAGE_ID:$IMAGE_VERSION
                
              

From 02d7c8c0ef02b72103fef4b8c503f840ab7ab970 Mon Sep 17 00:00:00 2001
From: Kokomo123 <jyvkcxe1@duck.com>
Date: Thu, 22 Aug 2024 18:58:20 -0400
Subject: [PATCH 15/15] This should fix it

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9edfd995..6b52e9ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
             run: |
                echo IMAGE_ID=$IMAGE_ID
                echo IMAGE_VERSION=$IMAGE_VERSION
-               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
+               docker tag $IMAGE_ID $IMAGE_ID:$IMAGE_VERSION
                docker push $IMAGE_ID:$IMAGE_VERSION