From 42ef613b2997adf9b0102757ea7e8e8156945cd1 Mon Sep 17 00:00:00 2001
From: Matyas Selmeci <matyas@cs.wisc.edu>
Date: Tue, 8 Aug 2023 15:42:09 -0500
Subject: [PATCH] Change the default image OS from el8 (i.e., CentOS Stream 8)
 to al8 (i.e., Alma 8)

This changes the OS-less tags (such as 3.6-release) to be equivalent to the
corresponding al8 tags (so 3.6-al8-release).  It keeps the al8 tags for
backward compat, in case anybody is using those, it just adds the OS-less
tags as aliases.

Note that this has the side effect of making tags like 3.6-el8-release for
the CentOS Stream 8-based builds, which we didn't have before.
---
 .github/workflows/build-container.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 50b2101..c502a2c 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -31,11 +31,7 @@ jobs:
           OS: ${{ matrix.os }}
         run: |
           PREFIX="output_image=${GITHUB_REPOSITORY}:${SERIES}"
-          if [[ $OS == 'el8' ]]; then
-            echo "${PREFIX}-${REPO}" >> ${GITHUB_OUTPUT}
-          else
-            echo "${PREFIX}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
-          fi
+          echo "${PREFIX}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
 
       - id: build-image
         uses: opensciencegrid/build-container-action@v0.6.0
@@ -105,6 +101,7 @@ jobs:
           github.repository_owner == 'opensciencegrid'
         env:
           IMAGE_LIST: ${{ steps.build-image.outputs.image-list}}
+          DEFAULT_OS: al8
         run: |
           for registry in hub.opensciencegrid.org docker.io; do
             IFS=,
@@ -112,5 +109,14 @@ jobs:
               fqin=${registry}/${image}
               docker tag ${image} ${fqin}
               docker push ${fqin}
+
+              # Also tag the image for the default OS as the OS-less tag
+              # (i.e. 3.6-al8-release -> 3.6-release)
+              image2=${image/-${DEFAULT_OS}-/-}  # bash syntax for search-and-replace
+              if [[ $image2 != $image ]]; then
+                fqin2=${registry}/${image2}
+                docker tag ${image} ${fqin2}
+                docker push ${fqin2}
+              fi
             done
           done