From 70c9eefff30fab5e59ae8403d4573419e4832284 Mon Sep 17 00:00:00 2001
From: Paco Xu <paco.xu@daocloud.io>
Date: Fri, 3 Nov 2023 14:39:09 +0800
Subject: [PATCH] add --sbom=false --provenance=false for windows servercore
 cache build

---
 build/pause/Makefile         | 4 ++--
 cluster/images/etcd/Makefile | 1 +
 test/images/windows/Makefile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/pause/Makefile b/build/pause/Makefile
index cd15f89349f..1c49bf2fa42 100644
--- a/build/pause/Makefile
+++ b/build/pause/Makefile
@@ -122,12 +122,12 @@ bin/wincat-windows-${ARCH}: windows/wincat/wincat.go
 
 container: .container-${OS}-$(ARCH)
 .container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH)
-	docker buildx build --provenance=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
+	docker buildx build --provenance=false --sbom=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
 		-t $(IMAGE):$(TAG)-${OS}-$(ARCH) --build-arg BASE=${BASE} --build-arg ARCH=$(ARCH) .
 	touch $@
 
 .container-windows-$(ARCH): $(foreach binary, ${BIN}, bin/${binary}-${OS}-${ARCH})
-	docker buildx build --provenance=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
+	docker buildx build --provenance=false --sbom=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
 		-t $(IMAGE):$(TAG)-${OS}-$(ARCH)-${OSVERSION} --build-arg BASE=${BASE}-windows-${OSVERSION}-${ARCH} --build-arg ARCH=$(ARCH) -f Dockerfile_windows .
 	touch $@
 
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index cb447f5b292..85e3737ab82 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -193,6 +193,7 @@ endif
 	docker buildx build \
 		--pull \
 		--provenance=false \
+		--sbom=false \
 		--output=type=$(OUTPUT_TYPE) \
 		--platform "$(OS)/$(ARCH)" \
 		-t $(REGISTRY)/etcd:$(IMAGE_TAG)-$(IMAGE_SUFFIX) \
diff --git a/test/images/windows/Makefile b/test/images/windows/Makefile
index 8930be12b29..080536e831e 100644
--- a/test/images/windows/Makefile
+++ b/test/images/windows/Makefile
@@ -34,7 +34,7 @@ sub-push-%:
 
 sub-repush-as-linux-%:
 	img_version=$(shell cat $*/VERSION); \
-	docker buildx build --progress=plain --no-cache --pull --output=type=registry --platform "linux/amd64" \
+	docker buildx build --provenance=false --sbom=false --progress=plain --no-cache --pull --output=type=registry --platform "linux/amd64" \
 		--build-arg SOURCE="$(REGISTRY)/$*:$${img_version}" -t "$(REGISTRY)/$*:$${img_version}"-linux-cache $*/
 
 all-build: $(foreach image, ${ALL_IMAGES}, sub-build-${image})