From eadc78f7a0f9411fc5c01fb83518172823453797 Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Tue, 20 May 2025 15:08:03 -0600
Subject: [PATCH 1/3] docker-image-common.yml: Delete image_tag output.

---
 .github/workflows/docker-image-common.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/docker-image-common.yml b/.github/workflows/docker-image-common.yml
index 94eb60c5f4..2a3d367916 100644
--- a/.github/workflows/docker-image-common.yml
+++ b/.github/workflows/docker-image-common.yml
@@ -9,9 +9,6 @@ on:
       IMAGE_NAME:
         description: "Docker image name"
         value: ${{ jobs.build-image-and-test-docs.outputs.IMAGE_NAME }}
-      image_tag:
-        description: "First image tag"
-        value: ${{ jobs.build-image-and-test-docs.outputs.image_tag }}
       version_tag:
         description: "Version tag from Dockerfile"
         value: ${{ jobs.check-version.outputs.VERSION_TAG }}

From 38ffb63e59b8511cbe0ec21ddabc4c7dd4937b54 Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Tue, 20 May 2025 15:08:54 -0600
Subject: [PATCH 2/3] docker-image-common.yml set-image-tag: Add a way to get
 first tag

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

diff --git a/.github/workflows/docker-image-common.yml b/.github/workflows/docker-image-common.yml
index 2a3d367916..224e06e2dc 100644
--- a/.github/workflows/docker-image-common.yml
+++ b/.github/workflows/docker-image-common.yml
@@ -83,7 +83,7 @@ jobs:
       - name: Set image tag for docs build
         id: set-image-tag
         run: |
-          echo "IMAGE_TAG=$(echo '${{ steps.meta.outputs.tags }}' | cut -d',' -f1)" >> $GITHUB_ENV
+          echo "IMAGE_TAG=$(echo '${{ steps.meta.outputs.tags }}' | head -n 1 | cut -d',' -f1)" >> $GITHUB_ENV
       - name: Build docs using container
         id: build-docs
         run: |

From 5c338a1e7372ba541cd5e23a975569fec712fd16 Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Tue, 20 May 2025 15:16:37 -0600
Subject: [PATCH 3/3] docker-image-build.yml: Fix trigger paths.

---
 .github/workflows/docker-image-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
index b5779e78cc..1b4c44f253 100644
--- a/.github/workflows/docker-image-build.yml
+++ b/.github/workflows/docker-image-build.yml
@@ -8,14 +8,14 @@ on:
       - 'doc/ctsm-docs_container/**'
       - '!doc/ctsm-docs_container/README.md'
       - '.github/workflows/docker-image-ctsm-docs-build.yml'
-      - '.github/workflows/docker-image-build-common.yml'
+      - '.github/workflows/docker-image-common.yml'
 
   pull_request:
     paths:
       - 'doc/ctsm-docs_container/**'
       - '!doc/ctsm-docs_container/README.md'
       - '.github/workflows/docker-image-ctsm-docs-build.yml'
-      - '.github/workflows/docker-image-build-common.yml'
+      - '.github/workflows/docker-image-common.yml'
 
   workflow_dispatch: