simplify

Author: gotsysdba

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

@@ -9,12 +9,6 @@ on:
         description: "Select the OpenJDK version to build (leave empty to build all versions)"
         required: false
         default: ""
-        type: choice
-        options:
-          - ""
-          - "17"
-          - "21"
-          - "24"
 
 env:
   dst_img: openjdk-image-obaas
@@ -24,7 +18,7 @@ jobs:
   obaas-image:
     strategy:
       matrix:
-        base_version: ${{ fromJSON(github.event.inputs.base_version != '' && format('["{0}"]', github.event.inputs.base_version) || '["17","21","24"]') }}
+        base_version: [17, 21, 24]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -41,9 +35,20 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Determine OpenJDK version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ -n "${{ github.event.inputs.base_version }}" ]; then
+            echo "Using manual version ${{ github.event.inputs.base_version }}"
+            echo "VERSION=${{ github.event.inputs.base_version }}" >> $GITHUB_ENV
+          else
+            echo "Using matrix version ${{ matrix.base_version }}"
+            echo "VERSION=${{ matrix.base_version }}" >> $GITHUB_ENV
+          fi
+
       - name: Get latest Image Software Digest
         run: |
-          latest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }} /image_digest)
+          latest_digest=$(docker run --rm --entrypoint cat ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ env.VERSION }} /image_digest || true)
           echo "Current Digest: $latest_digest"
           echo "latest_digest=$latest_digest" >> $GITHUB_ENV
         continue-on-error: true
@@ -52,11 +57,12 @@ jobs:
         if: github.event_name == 'workflow_dispatch' || env.latest_digest == ''
         uses: ./.github/actions/process-image-openjdk
         with:
-          src_image: container-registry.oracle.com/java/openjdk:${{ matrix.base_version }}
-          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ matrix.base_version }}
+          src_image: container-registry.oracle.com/java/openjdk:${{ env.VERSION }}
+          dst_image: ghcr.io/${{ github.repository_owner }}/${{ env.dst_img }}:${{ env.VERSION }}
           description: ${{ env.description }}
           push: true
           pkg_command: dnf
+
       - name: Run Trivy Vulnerability Scanner
         id: trivy_scan
         if: env.latest_digest != ''