Add GraalVM 21 Image (#871)

Author: gotsysdba

.github/actions/process-image/action.yml

@@ -16,14 +16,15 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Set date and latest Tag
+    - name: Set date and version Tag
       shell: bash
       run: |
         full_dst_image=${{ inputs.dst_image }}
+        full_dst_tag=${full_dst_image#*:}
         now=$(date +'%Y.%m.%d')
         echo "date=$now" >> $GITHUB_ENV
         echo "date_dst_tag=$full_dst_image-${now//./}" >> $GITHUB_ENV
-        echo "latest_dst_tag=${full_dst_image%:*}:latest" >> $GITHUB_ENV
+        echo "version_dst_tag=${full_dst_image%:*}:${full_dst_tag%%-*}" >> $GITHUB_ENV
 
     - name: Write Dockerfile
       shell: bash
@@ -45,12 +46,12 @@ runs:
       with:
         context: "${{ runner.temp }}"
         push: false
-        tags: ${{ env.latest_dst_tag }}
+        tags: ${{ env.version_dst_tag }}
 
     - name: Build and Push Image
       uses: docker/build-push-action@v5
       if: ${{ inputs.push == 'true' }}
       with:
         context: "${{ runner.temp }}"
         push: true
-        tags: ${{ env.latest_dst_tag }},${{ env.date_dst_tag }}
+        tags: ${{ env.version_dst_tag }},${{ env.date_dst_tag }}

.github/workflows/obaas-base-image.yml

@@ -4,11 +4,14 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
 env:
-  src_tag: 17-muslib-ol8
+  src_tag_suffix: muslib-ol8
   dst_img: graalvm-native-image-obaas
-  description: "Oracle GraalVM for JDK 17 and OBaaS."
+  description: "Oracle GraalVM and OBaaS."
 jobs:
   obaas-image:
+    strategy:
+      matrix:
+        base_version: [17, 21]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -27,7 +30,7 @@ jobs:
 
       - name: Get latest Image Software Digest
         run: |
-          latest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:latest /image_digest)
+          latest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }} /image_digest)
           echo "Current Digest: $latest_digest"
           echo "latest_digest=$latest_digest" >> $GITHUB_ENV
         continue-on-error: true
@@ -36,8 +39,8 @@ jobs:
         if: env.latest_digest == ''
         uses: ./.github/actions/process-image
         with:
-          src_image: container-registry.oracle.com/graalvm/native-image:${{ env.src_tag }}
-          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ env.src_tag }}
+          src_image: container-registry.oracle.com/graalvm/native-image:${{ matrix.base_version }}-${{ env.src_tag_suffix }}
+          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}-${{ env.src_tag_suffix }}
           description: ${{ env.description }}
           push: true
 
@@ -51,32 +54,32 @@ jobs:
           docker run --rm ghcr.io/aquasecurity/trivy:latest image $TRIVY_DEFAULT $TRIVY_SCAN
           --username ${{ github.actor }}
           --password ${{ secrets.GITHUB_TOKEN }}
-          ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:latest
+          ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}
         continue-on-error: true
 
       - name: Update Existing Image
         id: update_image
         if: env.latest_digest != '' && steps.trivy_scan.outcome == 'failure'
         uses: ./.github/actions/process-image
         with:
-          src_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:latest
-          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ env.src_tag }}
+          src_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}
+          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}-${{ env.src_tag_suffix }}
           description: ${{ env.description }}
           push: false
 
       - name: Get newest Image Software Digest
         id: get_newest_digest
         if: steps.update_image.outcome != 'skipped'
         run: |
-          newest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:latest /image_digest)
+          newest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }} /image_digest)
           echo "New Digest: $newest_digest"
           echo "newest_digest=$newest_digest" >> $GITHUB_ENV
 
       - name: Push Updated Image
         if: steps.get_newest_digest.outcome != 'skipped' && env.latest_digest != env.newest_digest
         uses: ./.github/actions/process-image
         with:
-          src_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:latest
-          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ env.src_tag }}
+          src_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}
+          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}-${{ env.src_tag_suffix }}
           description: ${{ env.description }}
           push: true