From d877f5550dfa0e137aa81dd59e6c6e0f7d0e556f Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Fri, 24 Apr 2026 11:56:25 -0400 Subject: [PATCH 1/9] adjust tag setting logic --- .github/workflows/update_container_image.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index df3021b56..f42469f40 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -30,18 +30,14 @@ jobs: with: fetch-depth: 0 - - name: Determine image tag + - name: Fetch all tags + run: git fetch --tags + + - name: Determine latest tag id: set_tag run: | - # Use the pushed tag if this is a tag ref; otherwise fall back. - if [[ "$GITHUB_REF" == refs/tags/* ]]; then - TAG="${GITHUB_REF#refs/tags/}" - elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then - TAG="latest" - else - TAG="${GITHUB_SHA::7}" - fi - echo "docker_tag=$TAG" >> "$GITHUB_OUTPUT" + TAG=$(git describe --tags --abbrev=0) + echo "docker_tag=$TAG" >> $GITHUB_OUTPUT - name: Log in to the Container registry uses: docker/login-action@v3 From c432e57e22cc92822a16051c9cf413553406a360 Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Fri, 24 Apr 2026 12:06:36 -0400 Subject: [PATCH 2/9] adjust echo --- .github/workflows/update_container_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index f42469f40..8d95b20a8 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -37,7 +37,7 @@ jobs: id: set_tag run: | TAG=$(git describe --tags --abbrev=0) - echo "docker_tag=$TAG" >> $GITHUB_OUTPUT + echo "container tag=$TAG" >> $GITHUB_OUTPUT - name: Log in to the Container registry uses: docker/login-action@v3 From c34f1fec6b34e0937fe87ce67cf819fdcac32aa3 Mon Sep 17 00:00:00 2001 From: Ciheim <43519680+Ciheim@users.noreply.github.com> Date: Wed, 6 May 2026 23:38:54 -0400 Subject: [PATCH 3/9] Fix tag variable name --- .github/workflows/update_container_image.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index 8d95b20a8..5c7cbaee9 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -36,8 +36,7 @@ jobs: - name: Determine latest tag id: set_tag run: | - TAG=$(git describe --tags --abbrev=0) - echo "container tag=$TAG" >> $GITHUB_OUTPUT + echo "docker_tag=$(git describe --tags --abbrev=0)" >> "$GITHUB_OUTPUT" - name: Log in to the Container registry uses: docker/login-action@v3 From 22fd1e9012ba3c297ffa5e00050ded70a3ecb8d3 Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Thu, 7 May 2026 16:44:34 -0400 Subject: [PATCH 4/9] Correcting trigger and push logic --- .github/workflows/update_container_image.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index 5c7cbaee9..e6b7f30b4 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -10,8 +10,9 @@ on: type: choice options: ["true", "false"] - repository_dispatch: - types: [publish-conda-succeeded] + workflow_run: + workflows: ["Publish Conda"] + types: [completed] env: REGISTRY: ghcr.io @@ -39,18 +40,20 @@ jobs: echo "docker_tag=$(git describe --tags --abbrev=0)" >> "$GITHUB_OUTPUT" - name: Log in to the Container registry + if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push Docker image - if: ${{ inputs.dry_run != 'true' }} + + - name: Build Docker image + if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} uses: docker/build-push-action@v5 with: context: . file: ./container-files/Dockerfile-fre-cli - push: true + push: ${{ github.event_name == 'workflow_run' }} tags: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.set_tag.outputs.docker_tag }} From d3824ab16a9c3c80ab04c13fc77dbb858b5b961e Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Thu, 7 May 2026 16:49:05 -0400 Subject: [PATCH 5/9] fixing trigger name --- .github/workflows/update_container_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index e6b7f30b4..ec527a8ce 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -11,7 +11,7 @@ on: options: ["true", "false"] workflow_run: - workflows: ["Publish Conda"] + workflows: ["publish_conda"] types: [completed] env: From 2973611d5f1b42452f52b97d689063c572f810ae Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Thu, 7 May 2026 16:55:00 -0400 Subject: [PATCH 6/9] add echo --- .github/workflows/update_container_image.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index ec527a8ce..be59300f8 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -39,6 +39,9 @@ jobs: run: | echo "docker_tag=$(git describe --tags --abbrev=0)" >> "$GITHUB_OUTPUT" + - name: Show image tag + run: echo "Docker tag is ${{ steps.set_tag.outputs.docker_tag }}" + - name: Log in to the Container registry if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} uses: docker/login-action@v3 From 44decff5ea3be55457d793b7260c4509d660e1eb Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Thu, 7 May 2026 17:13:06 -0400 Subject: [PATCH 7/9] sed command --- .github/workflows/update_container_image.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index be59300f8..d669057b2 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -42,6 +42,10 @@ jobs: - name: Show image tag run: echo "Docker tag is ${{ steps.set_tag.outputs.docker_tag }}" + - name: Update fre-cli version in cylc-flow-tools.yaml + run: | + sed -i 's/^[[:space:]]*-[[:space:]]*noaa-gfdl::fre-cli==.*/ - noaa-gfdl::fre-cli==${{ steps.set_tag.outputs.docker_tag }}/' cylc-flow-tools.yaml + - name: Log in to the Container registry if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} uses: docker/login-action@v3 @@ -50,7 +54,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build Docker image if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} uses: docker/build-push-action@v5 From af773fc51a2ec596939c7cfca6e5da8b828b1f37 Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Thu, 7 May 2026 17:15:38 -0400 Subject: [PATCH 8/9] fix path --- .github/workflows/update_container_image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index d669057b2..16edf1a84 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -44,7 +44,7 @@ jobs: - name: Update fre-cli version in cylc-flow-tools.yaml run: | - sed -i 's/^[[:space:]]*-[[:space:]]*noaa-gfdl::fre-cli==.*/ - noaa-gfdl::fre-cli==${{ steps.set_tag.outputs.docker_tag }}/' cylc-flow-tools.yaml + sed -i 's/^[[:space:]]*-[[:space:]]*noaa-gfdl::fre-cli==.*/ - noaa-gfdl::fre-cli==${{ steps.set_tag.outputs.docker_tag }}/' ./container-files/cylc-flow-tools.yaml - name: Log in to the Container registry if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} From 267383d009b6acd511840c8e704e737fa88e8f2c Mon Sep 17 00:00:00 2001 From: Ciheim Brown Date: Fri, 8 May 2026 14:13:30 -0400 Subject: [PATCH 9/9] changing name to 'fre-cli' & removing push option during testing --- .github/workflows/update_container_image.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/update_container_image.yaml b/.github/workflows/update_container_image.yaml index 16edf1a84..3b851e09e 100644 --- a/.github/workflows/update_container_image.yaml +++ b/.github/workflows/update_container_image.yaml @@ -2,21 +2,13 @@ name: Build and Push Container Image on: workflow_dispatch: - inputs: - dry_run: - description: "Skip pushing container image" - required: true - default: "true" - type: choice - options: ["true", "false"] - workflow_run: workflows: ["publish_conda"] types: [completed] env: REGISTRY: ghcr.io - IMAGE_NAME: "noaa-gfdl/ubuntu-20-fre-cli-2025" + IMAGE_NAME: "noaa-gfdl/fre-cli" jobs: build-and-push: