create explicit ubuntu-22.04 and ubuntu-24.04 runner images

Signed-off-by: Jeffrey Sica <[email protected]>

Author: jeefy

.github/workflows/publish-image.yml

@@ -29,82 +29,10 @@ env:
 
 
 jobs:
-  build:
-    outputs:
-      image: ${{ steps.image.outputs.image }}
-      digest: ${{ steps.build-and-push.outputs.digest }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@main
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v3
-        with:
-          context: ./ci/gha-runner-image/
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          COSIGN_EXPERIMENTAL: "true"
-        # uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: |
-          cosign sign --yes \
-          ${{env.REGISTRY}}/${{env.IMAGE_NAME}}@${{steps.build-and-push.outputs.digest}}
-      - name: Output image
-        id: image
-        run: |
-          # NOTE: We need to use the image and digest in order to make sure
-          # that the image we attest has not been modified.
-          # NOTE: The digest output from docker/build-push-action is of the
-          # form "sha256:<digest>"
-          image_name="${REGISTRY}/${IMAGE_NAME}:${{ github.ref_name }}"
-          echo "::set-output name=image::$image_name"
-  build-openeuler:
+  build-images:
+    strategy:
+      matrix:
+        dockerfile: [ubuntu2204, ubuntu2404]
     outputs:
       image: ${{ steps.image.outputs.image }}
       digest: ${{ steps.build-and-push.outputs.digest }}
@@ -150,24 +78,24 @@ jobs:
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
-      - name: Build and push OpenEuler Docker image
-        id: build-and-push-openeuler
+      - name: Build and push ${{ matrix.dockerfile }} Docker image
+        id: build-and-push
         uses: docker/build-push-action@v3
         with:
           context: ./ci/gha-runner-image/
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            ghcr.io/cncf/gha-runner:openeuler
+            ghcr.io/cncf/gha-runner:${{ matrix.dockerfile }}
           labels: ${{ steps.meta.outputs.labels }}
-          file: ./ci/gha-runner-image/Dockerfile.openeuler
-      - name: Sign the published OpenEuler Docker image
+          file: ./ci/gha-runner-image/Dockerfile.22.04
+      - name: Sign the published ${{ matrix.dockerfile }} Docker image
         if: ${{ github.event_name != 'pull_request' }}
         env:
           COSIGN_EXPERIMENTAL: "true"
         # Uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
-        run: cosign sign -y ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:openeuler
+        run: cosign sign -y ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.dockerfile }}
       - name: Output image
         id: image
         run: |
@@ -177,10 +105,11 @@ jobs:
           # form "sha256:<digest>"
           image_name="${REGISTRY}/${IMAGE_NAME}:${{ github.ref_name }}"
           echo "::set-output name=image::$image_name"
+  
   # Generate SLSA provenance for the image
   # Upload the provenance to ghcr.io
   provenance:
-    needs: [build]
+    needs: [build-images]
     permissions:
       id-token: write  # For signing.
       actions: read    # For reading workflow info.
@@ -199,7 +128,7 @@ jobs:
     # branches for required status checks. It should have a unique name among
     # other pre-submits.
     name: verify container provenance
-    needs: [build, provenance]
+    needs: [build-images, provenance]
     permissions:
       packages: read  # For reading attestations.
     runs-on: ubuntu-latest

.gitignore

@@ -98,3 +98,5 @@ python_env_cncfpeople
 python_venv_ambassadors
 credentials.json
 token.json
+
+.DS_Store