From 6ef65483d7d09c804a808fcc9a0c1cc6f4014e6f Mon Sep 17 00:00:00 2001 From: M Atif Ali Date: Tue, 11 Mar 2025 00:39:22 +0500 Subject: [PATCH] Revert "chore: enable SBOM attestation for image builds (#16852)" This reverts commit 05ebece03ad2ee7cad6d04d4c5b7d3e39f4c76f2. --- .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 b381e2c4447e2..a963a7da6b19a 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 33b0126288fda..c2cbc52c3cc45 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 bf3e3bb8116bb..1bee954e9713c 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 \