From e817713dc052f7110233abcf18ad46b44f2a0306 Mon Sep 17 00:00:00 2001 From: M Atif Ali Date: Tue, 11 Mar 2025 00:55:03 +0500 Subject: [PATCH] revert: "chore: enable SBOM attestation for image builds" (#16868) Reverts coder/coder#16852 The CI failed to create the multi-arch manifest. https://github.com/coder/coder/actions/runs/13773079355/job/38516182819#step:18:341 I personally think we should move to a [multi-arch Dockerfile](https://docs.docker.com/build/building/multi-platform/#cross-compilation) instead of creating the manifest manually. --- .github/workflows/release.yaml | 1 - dogfood/contents/files/etc/docker/daemon.json | 5 +---- scripts/build_docker.sh | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b381e2c444..a963a7da6b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -361,7 +361,6 @@ jobs: file: scripts/Dockerfile.base platforms: linux/amd64,linux/arm64,linux/arm/v7 provenance: true - sbom: true pull: true no-cache: true push: true diff --git a/dogfood/contents/files/etc/docker/daemon.json b/dogfood/contents/files/etc/docker/daemon.json index 33b0126288..c2cbc52c3c 100644 --- a/dogfood/contents/files/etc/docker/daemon.json +++ b/dogfood/contents/files/etc/docker/daemon.json @@ -1,6 +1,3 @@ { - "registry-mirrors": ["https://mirror.gcr.io"], - "features": { - "containerd-snapshotter": true - } + "registry-mirrors": ["https://mirror.gcr.io"] } diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh index bf3e3bb811..1bee954e97 100755 --- a/scripts/build_docker.sh +++ b/scripts/build_docker.sh @@ -136,12 +136,10 @@ fi log "--- Building Docker image for $arch ($image_tag)" -docker buildx build \ +docker build \ --platform "$arch" \ --build-arg "BASE_IMAGE=$base_image" \ --build-arg "CODER_VERSION=$version" \ - --provenance true \ - --sbom true \ --no-cache \ --tag "$image_tag" \ -f Dockerfile \