fix missing series prefix in tag list

opensciencegrid · Sep 26, 2024 · 298cc2f · 298cc2f
1 parent ff373ab
commit 298cc2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/actions/build-container-local/action.yaml b/.github/actions/build-container-local/action.yaml
@@ -144,6 +144,7 @@ runs:
       echo "tag_list=${IMAGE_NAME},${TIMESTAMP_IMAGE}"                          >> ${GITHUB_OUTPUT}
       echo "ts_image=${TIMESTAMP_IMAGE}"                                        >> ${GITHUB_OUTPUT}
       echo "cache_key=$(tr ':/' '_' <<< $TIMESTAMP_IMAGE)_buildx_${GITHUB_SHA}" >> ${GITHUB_OUTPUT}
+      echo "base_image=${IMAGE_NAME%:*}"                                        >> ${GITHUB_OUTPUT}
 
   - name: Set up Docker Buildx
     if: success()
@@ -173,7 +174,7 @@ runs:
         TIMESTAMP_IMAGE=${{ steps.generate-tags.outputs.ts_image }}
       #tags: ${{ steps.generate-tags.outputs.tag_list }}
       cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
-      outputs: type=image,name=${{ inputs.output_image }},push-by-digest=true,name-canonical=true,push=true
+      outputs: type=image,name=${{ steps.generate-tags.outputs.base_image }},push-by-digest=true,name-canonical=true,push=true
 
   - name: Cache Docker images
     if: success() && fromJSON(inputs.cache_image)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -39,12 +39,10 @@ jobs:
           PREFIX="output_image=${GITHUB_REPOSITORY}:${SERIES}"
           echo "${PREFIX}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
           echo "base_tag=${SERIES}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
-          echo "registry_image=hub.opensciencegrid.org/${GITHUB_REPOSITORY}" >> ${GITHUB_OUTPUT}
 
       - id: slash-escape
         run: |
           platform=${{ matrix.platform }}
-          output_image=${{ steps.custom-image-name.outputs.output_image }}
           echo "platform=${platform//\//-}" >> ${GITHUB_OUTPUT}
 
       - name: Harbor login
@@ -61,12 +59,12 @@ jobs:
       - id: build-image
         uses: ./.github/actions/build-container-local
         with:
+          registry_url: hub.opensciencegrid.org
           osg_series: ${{ matrix.osg_series }}
           osg_repo: ${{ matrix.repo }}
           base_os: ${{ matrix.os }}
           platform: ${{ matrix.platform }}
-          output_image: ${{ steps.custom-image-name.outputs.registry_image }}
-          #output_image: ${{ steps.custom-image-name.outputs.output_image }}
+          output_image: ${{ steps.custom-image-name.outputs.output_image }}
 
       - name: Export digest
         run: |