From e05fc12b1225a616bb9ecdff715c93cc6247bd67 Mon Sep 17 00:00:00 2001
From: Christopher Reid <creid@nvidia.com>
Date: Fri, 27 Feb 2026 14:28:06 -0500
Subject: [PATCH 1/2] ci: fix docker publish after workflow changes

Signed-off-by: Christopher Reid <creid@nvidia.com>
---
 .github/workflows/_docker-publish.yaml | 35 +++++++++++++-------------
 .github/workflows/release.yaml         |  2 ++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/_docker-publish.yaml b/.github/workflows/_docker-publish.yaml
index 83a9331..0742804 100644
--- a/.github/workflows/_docker-publish.yaml
+++ b/.github/workflows/_docker-publish.yaml
@@ -3,6 +3,10 @@ name: Docker Publish
 on:
   workflow_call:
     inputs:
+      version:
+        description: Release version (e.g., 1.0.0)
+        required: true
+        type: string
       registry:
         description: Container registry
         type: string
@@ -34,32 +38,29 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ inputs.registry }}/${{ inputs.image_name }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
       - name: Download image artifact
         uses: actions/download-artifact@v4
         with:
           name: docker-image
 
       - name: Load and tag image
+        env:
+          REGISTRY: ${{ inputs.registry }}
+          IMAGE_NAME: ${{ inputs.image_name }}
+          VERSION: ${{ inputs.version }}
         run: |
           docker load -i farm-image.tar
-          # Get the loaded image ID
           LOADED_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" | head -1)
-          # Tag with all required tags
-          echo "${{ steps.meta.outputs.tags }}" | while read tag; do
-            [ -n "$tag" ] && docker tag "$LOADED_IMAGE" "$tag"
-          done
+          MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
+          docker tag "$LOADED_IMAGE" "$REGISTRY/$IMAGE_NAME:$VERSION"
+          docker tag "$LOADED_IMAGE" "$REGISTRY/$IMAGE_NAME:$MAJOR_MINOR"
 
       - name: Push image
+        env:
+          REGISTRY: ${{ inputs.registry }}
+          IMAGE_NAME: ${{ inputs.image_name }}
+          VERSION: ${{ inputs.version }}
         run: |
-          echo "${{ steps.meta.outputs.tags }}" | while read tag; do
-            [ -n "$tag" ] && docker push "$tag"
-          done
+          MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
+          docker push "$REGISTRY/$IMAGE_NAME:$VERSION"
+          docker push "$REGISTRY/$IMAGE_NAME:$MAJOR_MINOR"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 901a5c4..08013a5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -52,6 +52,8 @@ jobs:
     name: Publish Docker
     needs: [e2e]
     uses: ./.github/workflows/_docker-publish.yaml
+    with:
+      version: ${{ needs.determine-version.outputs.version }}
     secrets: inherit
 
   publish-helm:

From 30041b834180ac9d1046d45d66c7ccdb448a8497 Mon Sep 17 00:00:00 2001
From: Christopher Reid <creid@nvidia.com>
Date: Fri, 27 Feb 2026 14:29:15 -0500
Subject: [PATCH 2/2] remove MAJOR_MINOR

---
 .github/workflows/_docker-publish.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/_docker-publish.yaml b/.github/workflows/_docker-publish.yaml
index 0742804..ae8f94e 100644
--- a/.github/workflows/_docker-publish.yaml
+++ b/.github/workflows/_docker-publish.yaml
@@ -51,9 +51,7 @@ jobs:
         run: |
           docker load -i farm-image.tar
           LOADED_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" | head -1)
-          MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
           docker tag "$LOADED_IMAGE" "$REGISTRY/$IMAGE_NAME:$VERSION"
-          docker tag "$LOADED_IMAGE" "$REGISTRY/$IMAGE_NAME:$MAJOR_MINOR"
 
       - name: Push image
         env:
@@ -61,6 +59,4 @@ jobs:
           IMAGE_NAME: ${{ inputs.image_name }}
           VERSION: ${{ inputs.version }}
         run: |
-          MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
           docker push "$REGISTRY/$IMAGE_NAME:$VERSION"
-          docker push "$REGISTRY/$IMAGE_NAME:$MAJOR_MINOR"