re-add creation of el-less tag

opensciencegrid · Oct 1, 2024 · edf18c0 · edf18c0
1 parent ea03c11
commit edf18c0
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -17,8 +17,8 @@ jobs:
         # os: ['el9', 'cuda_11_8_0']
         os: ['el9']
         osg_series: ['23']
-        repo: ['development', 'testing', 'release']
-        # platform: ['linux/amd64']
+        repo: ['development']
+        #repo: ['development', 'testing', 'release']
         platform: ['linux/amd64','linux/arm64']
         exclude:
           # cuda builds take a super long time; only do one of them
@@ -194,7 +194,8 @@ jobs:
         # os: ['el9', 'cuda_11_8_0']
         os: ['el9']
         osg_series: ['23']
-        repo: ['development', 'testing', 'release']
+        repo: ['development']
+        #repo: ['development', 'testing', 'release']
         exclude:
           # cuda builds take a super long time; only do one of them
           - os: cuda_11_8_0
@@ -240,10 +241,20 @@ jobs:
 
     - name: Merge Artifacts
       working-directory: /tmp
+      env:
+        DEFAULT_OS: el9
       run: |
         BASE_IMG=hub.opensciencegrid.org/opensciencegrid/osgvo-docker-pilot
         DIGESTS=$(for digest in $(ls digests/); do echo $BASE_IMG@sha256:$digest; done)
         TAGS=$(cat tags/*-amd64)
         for tag in ${TAGS//,/ }; do 
           docker buildx imagetools create --tag $tag $DIGESTS;
+
+          # Also tag the image for the default OS as the OS-less tag
+          # (i.e. 23-el9-release -> 23-release)
+          tag2=${tag/-${DEFAULT_OS}-/-}  # bash syntax for search-and-replace
+          if [[ $tag2 != $tag ]]; then
+            docker buildx imagetools create --tag $tag2 $DIGESTS;
+          fi
         done
+