From 1ead9cd2911c14529ce41864ca2c14508e60c156 Mon Sep 17 00:00:00 2001 From: Manu Bretelle Date: Mon, 19 Aug 2024 23:32:34 -0700 Subject: [PATCH] runner: Build containers for both Ubuntu Focal and Ubuntu Noble We can now pass a custom UBUNTU_VERSION value to build a specific version of the container. The name of the container needs to be changed to account for the version name. Signed-off-by: Manu Bretelle --- .github/workflows/publish.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 92205d8..8110fe4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -43,12 +43,21 @@ jobs: - arch: s390x dockerfile: s390x.Dockerfile platform: linux/s390x + ubuntu_version: + - focal + - noble - arch: aarch64 dockerfile: Dockerfile platform: linux/arm64 + ubuntu_version: + - focal + - noble - arch: x86_64 dockerfile: Dockerfile platform: linux/amd64 + ubuntu_version: + - focal + - noble steps: - name: Checkout repository @@ -89,7 +98,7 @@ jobs: flavor: | latest=auto prefix= - suffix=-${{ matrix.arch }} + suffix=-${{ matrix.ubuntu_version }}-${{ matrix.arch }} # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action @@ -103,6 +112,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: ${{ matrix.platform }} + build-args: UBUNTU_VERSION=${{ matrix.ubuntu_version }} # Sign the resulting Docker image digest except on PRs. # This will only write to the public Rekor transparency log when the Docker