From 698469e9b096afe11b60dcbb9f38add93021f2fc Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:35:10 -0400
Subject: [PATCH 01/22] Support for patch release tags.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 15d1fc7d1..c274d7bd0 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -41,6 +41,21 @@ jobs:
 
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
+
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+            echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq tail 1)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+          else
+            echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
             
       - name: docker metadata for building
         id: image-metadata
@@ -49,8 +64,8 @@ jobs:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           tags: |
             raw,latest
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:

From 9d666ba3298a1f29591c8bf766a25979ce7a676f Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:40:43 -0400
Subject: [PATCH 02/22] Tail.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index c274d7bd0..7ea1fe6a2 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -47,7 +47,7 @@ jobs:
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
-            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq tail 1)
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail 1)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
           else

From 5fc1bd99df4e184b716dda4b86a6cc5cac6b45b8 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:42:04 -0400
Subject: [PATCH 03/22] Remove VERSION_WITHOUT_V.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 7ea1fe6a2..20d9f5f62 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -36,10 +36,8 @@ jobs:
         id: extract_version
         run: |
           VERSION=${{ github.event.inputs.docker_tag_version }}
-          VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
-          echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
       - name: Determine image version tag

From c4095d3e0e522bc32cbd32856ffbc1aa0062d2d0 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:49:03 -0400
Subject: [PATCH 04/22] Add env.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 20d9f5f62..b07114b91 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -54,6 +54,8 @@ jobs:
           fi
 
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{env.VERSION }}
             
       - name: docker metadata for building
         id: image-metadata

From 579126f784b1b41ff8c77aa2c4156b1ae4010d50 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:50:45 -0400
Subject: [PATCH 05/22] Add env.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index b07114b91..4dc25ffae 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -38,6 +38,7 @@ jobs:
           VERSION=${{ github.event.inputs.docker_tag_version }}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
       - name: Determine image version tag

From b399cbb303984a667758afb278c7612b5f46aa3c Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 15:53:37 -0400
Subject: [PATCH 06/22] Add env.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 4dc25ffae..4811229b1 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -36,9 +36,11 @@ jobs:
         id: extract_version
         run: |
           VERSION=${{ github.event.inputs.docker_tag_version }}
+          VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
           echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
       - name: Determine image version tag
@@ -64,7 +66,7 @@ jobs:
         with:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           tags: |
-            raw,latest
+            # raw,latest
             type=raw,value=${{ env.IMAGE_TAG }}
             type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}

From f28948127e66d27923a511494b9cf0da02857e55 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 16:00:09 -0400
Subject: [PATCH 07/22] Fix the tail.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 4811229b1..42cfdd6f1 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -48,7 +48,7 @@ jobs:
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
-            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail 1)
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
           else

From 91c7e0add038eeca5d3337a058f97cb59096942a Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 17 Jul 2024 16:02:31 -0400
Subject: [PATCH 08/22] Add logs.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 42cfdd6f1..de253463e 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -51,6 +51,7 @@ jobs:
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Buliding patch release ${$IMAGE_TAG}!"
           else
             echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
             IMAGE_TAG="${{ env.VERSION }}"

From 1d251aa496779bc1169487ccd53ca8ea12eeb561 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 09:49:21 -0400
Subject: [PATCH 09/22] Fix last patch.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index de253463e..c96267cba 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -48,10 +48,10 @@ jobs:
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
-            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1)
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-'' -f2)")
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
-            echo "Buliding patch release ${$IMAGE_TAG}!"
+            echo "Buliding patch release ${IMAGE_TAG}!"
           else
             echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
             IMAGE_TAG="${{ env.VERSION }}"

From 99b7ff36f8cf7e7211ffc00377f4dada46ee5e1b Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 09:50:15 -0400
Subject: [PATCH 10/22] Fix last patch.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index c96267cba..708efad74 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -48,7 +48,7 @@ jobs:
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
-            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-'' -f2)")
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-'' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
             echo "Buliding patch release ${IMAGE_TAG}!"

From 4bc9b54ed5ee9151be1e761d9957cefdffd1eeb8 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 09:51:35 -0400
Subject: [PATCH 11/22] Fix last patch.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 708efad74..fe2610d85 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -48,7 +48,7 @@ jobs:
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
-            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-'' -f2)
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
             echo "Buliding patch release ${IMAGE_TAG}!"

From 0e2edd344b6598fde665dd40eb1e2bd12f9f26a1 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 10:04:37 -0400
Subject: [PATCH 12/22] Add fluentbit debug image.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index fe2610d85..9b4fae696 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -118,6 +118,24 @@ jobs:
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+            echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Buliding patch release ${IMAGE_TAG}!"
+          else
+            echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+  
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{env.VERSION }}
+
       - name: docker metadata
         id: image-metadata
         uses: docker/metadata-action@v5
@@ -127,8 +145,8 @@ jobs:
             latest=false
             suffix=-debug
           tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:

From 49b670715b8ae6addd90534158de3b279e03b299 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 10:14:51 -0400
Subject: [PATCH 13/22] Add fluentbit debug image.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 9b4fae696..cd3c1f061 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -115,13 +115,14 @@ jobs:
           VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-debug; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))

From b03989978cd11f8b4d644ab553e87d8c423225be Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 10:22:58 -0400
Subject: [PATCH 14/22] Typos.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index cd3c1f061..b0edc1d88 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -51,7 +51,7 @@ jobs:
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
-            echo "Buliding patch release ${IMAGE_TAG}!"
+            echo "Building patch release ${IMAGE_TAG}!"
           else
             echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
             IMAGE_TAG="${{ env.VERSION }}"
@@ -123,13 +123,13 @@ jobs:
         id: determine-tags
         run: |
           if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-debug; then
-            echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
+            echo "${{ env.VERSION }}-debug tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
             IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
-            echo "Buliding patch release ${IMAGE_TAG}!"
+            echo "Building patch release ${IMAGE_TAG}-debug!"
           else
-            echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
+            echo "${{ env.VERSION }}-debug tag does not exist, assuming we're building a new release!"
             IMAGE_TAG="${{ env.VERSION }}"
           fi
   

From 300218f627d52eb8e87445232913ceeff1046bcc Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 10:52:26 -0400
Subject: [PATCH 15/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 12 ++--
 .github/workflows/build-fd-image.yaml | 89 +++++++++++++++++++--------
 2 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index b0edc1d88..818d23871 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -73,6 +73,7 @@ jobs:
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
 
       - name: docker tags for cloning
@@ -81,11 +82,12 @@ jobs:
         with:
           tags: |
             raw,latest
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
 
       - name: Set outputs
@@ -151,6 +153,7 @@ jobs:
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
 
       - name: docker tags for cloning
@@ -161,11 +164,12 @@ jobs:
             latest=false
             suffix=-debug
           tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
       
       - name: Set outputs
diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index b417a91c0..7cda7f7a8 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -35,12 +35,34 @@ jobs:
         id: extract_version
         run: |
           VERSION=${{ github.event.inputs.docker_tag_version }}
+          VERSION_SUFFIX="amd64"
           VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
-            
+
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!"
+          else
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+  
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{env.VERSION }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}
+          
       - name: docker metadata for amd64
         id: image-metadata
         uses: docker/metadata-action@v5
@@ -48,15 +70,17 @@ jobs:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           flavor: |
             latest=false
-            suffix=-amd64
+            suffix=-${{ env.VERSION_SUFFIX }}
           tags: |
             raw,latest
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}
 
       - name: Set outputs
         id: set-outputs
@@ -79,12 +103,34 @@ jobs:
         id: extract_version
         run: |
           VERSION=${{ github.event.inputs.docker_tag_version }}
+          VERSION_SUFFIX="arm64"
           VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
-            
+
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!"
+          else
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+  
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{ env.VERSION }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}      
+
       - name: docker metadata for arm64
         id: image-metadata
         uses: docker/metadata-action@v5
@@ -92,15 +138,17 @@ jobs:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           flavor: |
             latest=false
-            suffix=-arm64
+            suffix=-${{ env.VERSION_SUFFIX }}
           tags: |
             raw,latest
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}
 
       - name: Set outputs
         id: set-outputs
@@ -125,9 +173,12 @@ jobs:
         id: extract_version
         run: |
           VERSION=${{ github.event.inputs.docker_tag_version }}
+          VERSION_SUFFIX="arm64-base"
           VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
             
@@ -138,28 +189,16 @@ jobs:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           flavor: |
             latest=false
-            suffix=-arm64-base
-          tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=${{ env.MAJOR_MINOR }}
-            type=raw,value=v${{ env.MAJOR_MINOR }}
-        env:
-          MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
-      - name: docker metadata for arm64 base image
-        id: image-tags
-        uses: docker/metadata-action@v5
-        with:
-          flavor: |
-            latest=false
-            suffix=-arm64-base
+            suffix=-${{ env.VERSION_SUFFIX }}
           tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}
 
       - name: Set outputs
         id: set-outputs

From df4de2e67b51dca238675b581b2b5d2f096f2e23 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 10:55:32 -0400
Subject: [PATCH 16/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fd-image.yaml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 7cda7f7a8..3fdf379fa 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -181,7 +181,26 @@ jobs:
           echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
-            
+
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!"
+          else
+            echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+    
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{ env.VERSION }}
+          VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}            
+          
       - name: docker metadata for arm64 base image
         id: image-metadata
         uses: docker/metadata-action@v5

From c9eb9eb89f96c2ebba3824eebe435d47bacfa3c1 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 11:05:51 -0400
Subject: [PATCH 17/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fd-image.yaml | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 3fdf379fa..0df2c5bd0 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -407,20 +407,40 @@ jobs:
           VERSION_WITHOUT_V=${VERSION#v}
           MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2)
 
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV
           echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
+      - name: Determine image version tag
+        id: determine-tags
+        run: |
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+            echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
+            LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
+            NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
+            IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}"
+            echo "Building patch release ${IMAGE_TAG}!"
+          else
+            echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!"
+            IMAGE_TAG="${{ env.VERSION }}"
+          fi
+    
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+        env:
+          VERSION: ${{ env.VERSION }}
+          
       - name: docker metadata for manifest
         id: image-metadata
         uses: docker/metadata-action@v5
         with:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
       
       - name: docker tags for cloning
@@ -428,11 +448,12 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           tags: |
-            type=raw,value=${{ github.event.inputs.docker_tag_version }}
-            type=raw,value=v${{ github.event.inputs.docker_tag_version }}
+            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}
             type=raw,value=v${{ env.MAJOR_MINOR }}
         env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
           MAJOR_MINOR: ${{ env.MAJOR_MINOR }}
             
       - name: Set outputs

From 3a41d2f40d9ee934c15d3cb67e05b051fb9013ab Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 13:23:37 -0400
Subject: [PATCH 18/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fd-image.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 0df2c5bd0..3b66e57aa 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect --no-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
@@ -115,7 +115,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect --no-tags --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
@@ -185,7 +185,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect --no-tags --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
@@ -414,7 +414,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+          if skopeo inspect --no-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))

From fd741c41ff8229fbd89fea03569cc251259d3ecf Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 13:26:55 -0400
Subject: [PATCH 19/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fd-image.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 3b66e57aa..95159bc46 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect --no-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
@@ -115,7 +115,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect --no-tags --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))
@@ -414,7 +414,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect --no-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
+          if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then
             echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))

From 054553c7f98023eefc597038324cdd19c239d9b8 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 13:27:58 -0400
Subject: [PATCH 20/22] Re-factor fluentd build.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fd-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 95159bc46..37f6a4ed4 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -185,7 +185,7 @@ jobs:
       - name: Determine image version tag
         id: determine-tags
         run: |
-          if skopeo inspect --no-tags --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
+          if skopeo inspect --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then
             echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!"
             LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2)
             NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1))

From ab48d8e0711615e75fb281729a4c549ffac8d4ed Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 13:46:36 -0400
Subject: [PATCH 21/22] Add README.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 cmd/fluent-watcher/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 cmd/fluent-watcher/README.md

diff --git a/cmd/fluent-watcher/README.md b/cmd/fluent-watcher/README.md
new file mode 100644
index 000000000..e5d8ef05d
--- /dev/null
+++ b/cmd/fluent-watcher/README.md
@@ -0,0 +1,19 @@
+# fluent-watcher
+
+This directory contains `Dockerfiles` for the custom build of both `fluentd` and `fluent-bit` that `fluent-operator` uses.
+
+These custom builds include a wrapper that watches for configuration changes and reloads/restarts the `fluentd` and `fluent-bit` processes.  These images are required for running the fluent-operator.
+
+## Versioning
+
+These images track upstream versions/tags.  For example, Fluent Operator's `ghcr.io/fluent/fluent-operator/fluent-bit:3.1.12` image is based off of the upstream `fluentd/fluent-bit:3.1.12` image.
+
+Occasionally, changes to Fluent Operator's customizations need to be introduced into the images out of band of upstream version changes.  When this happens, we add a "patch version" to the tag.  For example, the `ghcr.io/fluent/fluent-operator/fluent-bit:3.1.12-1` image remains based off of the upstream `fluent/fluent-bit:3.1.2` image but contains a Fluent Operator-specific patch (`-1`).
+
+We strive to never overwrite existing image tags (eg, `ghcr.io/fluent/fluent-operator/fluent-bit:3.1.12`) with customizations and/or patches.
+
+## Building
+
+As a maintainer, to build the `ghcr.io/fluent/fluent-operator/fluent-bit` and `ghcr.io/fluent/fluent-operator/fluentd` images, you can run the "Build Fluent Bit image" or "Build Fluentd image" Github Action workflows in the "Actions" tab of this repository.
+
+Always specify the upstream Fluent Bit version (eg, `3.1.2`, `3.1.3`, etc) when running this workflow.  If the CI workflow detects that an image tag already exists for the version specified, it will assume that a patch release needs to be built and will automatically add a patch version to the image tag (eg, `3.1.2-1`, `3.1.2-2`, etc).
\ No newline at end of file

From bfe3aea9223da945991aabd57e526a4449e08f47 Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Thu, 18 Jul 2024 13:50:44 -0400
Subject: [PATCH 22/22] Build latest.

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .github/workflows/build-fb-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 818d23871..fb5b22520 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -67,7 +67,7 @@ jobs:
         with:
           images: "ghcr.io/${{ env.GITHUB_IMAGE }}"
           tags: |
-            # raw,latest
+            raw,latest
             type=raw,value=${{ env.IMAGE_TAG }}
             type=raw,value=v${{ env.IMAGE_TAG }}
             type=raw,value=${{ env.MAJOR_MINOR }}