From d92f65abca1c5f1254548359cb18f5f6368bf828 Mon Sep 17 00:00:00 2001 From: Seunguk Shin Date: Mon, 23 Dec 2024 10:35:27 +0000 Subject: [PATCH 1/2] ci: fix failure to build kbs-client on s390x The official rust docker image supports s390x from v1.78.0 Signed-off-by: Seunguk Shin --- kbs/docker/kbs-client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbs/docker/kbs-client/Dockerfile b/kbs/docker/kbs-client/Dockerfile index 5d3ea6a0f..257eee6a3 100644 --- a/kbs/docker/kbs-client/Dockerfile +++ b/kbs/docker/kbs-client/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76.0 AS builder +FROM rust:1.78.0 AS builder ARG ARCH=x86_64 WORKDIR /usr/src/kbs From 3703b0f3b7e18db396210263c2da60399f60e917 Mon Sep 17 00:00:00 2001 From: Seunguk Shin Date: Mon, 23 Dec 2024 11:24:26 +0000 Subject: [PATCH 2/2] ci: fix failure to create multi-arch images Disable provenance information to create multi-arch image Signed-off-by: Seunguk Shin --- .github/workflows/build-as-image.yml | 2 +- .github/workflows/build-kbs-image.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-as-image.yml b/.github/workflows/build-as-image.yml index fdf0befd5..c7f08b6a9 100644 --- a/.github/workflows/build-as-image.yml +++ b/.github/workflows/build-as-image.yml @@ -67,7 +67,7 @@ jobs: - name: Build ${{ matrix.name }} Container Image run: | commit_sha=${{ github.sha }} - docker buildx build --platform "${{ matrix.target_platform }}" \ + docker buildx build --platform "${{ matrix.target_platform }}" --provenance false \ -f "${{ matrix.docker_file }}" ${{ inputs.build_option }} \ --build-arg BUILDPLATFORM="${{ matrix.build_platform }}" \ --build-arg ARCH="${{ matrix.target_arch }}" \ diff --git a/.github/workflows/build-kbs-image.yml b/.github/workflows/build-kbs-image.yml index 4491b908b..95f87c907 100644 --- a/.github/workflows/build-kbs-image.yml +++ b/.github/workflows/build-kbs-image.yml @@ -78,7 +78,7 @@ jobs: - name: Build Container Image KBS (${{ matrix.name }}) run: | commit_sha=${{ github.sha }} - docker buildx build --platform "${{ matrix.target_platform }}" \ + docker buildx build --platform "${{ matrix.target_platform }}" --provenance false \ -f "${{ matrix.docker_file }}" ${{ inputs.build_option }} \ -t "ghcr.io/confidential-containers/staged-images/${{ matrix.tag }}:${commit_sha}-${{ matrix.target_arch }}" \ -t "ghcr.io/confidential-containers/staged-images/${{ matrix.tag }}:latest-${{ matrix.target_arch }}" \