github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121711 from pacoxu/fix-buildx

Browse Source 
Fix buildx add --provenance=false for pause image build and windows servercore cache
This commit is contained in:
Kubernetes Prow Robot 2023-11-13 20:30:26 +01:00 committed by GitHub
commit cf7a150bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/pause/Makefile
View File

@ -122,12 +122,12 @@ bin/wincat-windows-${ARCH}: windows/wincat/wincat.go
container: .container-${OS}-$(ARCH) container: .container-${OS}-$(ARCH)
.container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH) .container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH)
docker buildx build --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) . -t $(IMAGE):$(TAG)-${OS}-$(ARCH) --build-arg BASE=${BASE} --build-arg ARCH=$(ARCH) .
touch $@ touch $@
.container-windows-$(ARCH): $(foreach binary, ${BIN}, bin/${binary}-${OS}-${ARCH}) .container-windows-$(ARCH): $(foreach binary, ${BIN}, bin/${binary}-${OS}-${ARCH})
docker buildx build --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 . -t $(IMAGE):$(TAG)-${OS}-$(ARCH)-${OSVERSION} --build-arg BASE=${BASE}-windows-${OSVERSION}-${ARCH} --build-arg ARCH=$(ARCH) -f Dockerfile_windows .
touch $@ touch $@

1
cluster/images/etcd/Makefile
View File

@ -193,6 +193,7 @@ endif
docker buildx build \ docker buildx build \
--pull \ --pull \
--provenance=false \ --provenance=false \
--sbom=false \
--output=type=$(OUTPUT_TYPE) \ --output=type=$(OUTPUT_TYPE) \
--platform "$(OS)/$(ARCH)" \ --platform "$(OS)/$(ARCH)" \
-t $(REGISTRY)/etcd:$(IMAGE_TAG)-$(IMAGE_SUFFIX) \ -t $(REGISTRY)/etcd:$(IMAGE_TAG)-$(IMAGE_SUFFIX) \

2
test/images/windows/Makefile
View File

@ -34,7 +34,7 @@ sub-push-%:
sub-repush-as-linux-%: sub-repush-as-linux-%:
img_version=$(shell cat $*/VERSION); \ 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 $*/ --build-arg SOURCE="$(REGISTRY)/$*:$${img_version}" -t "$(REGISTRY)/$*:$${img_version}"-linux-cache $*/
all-build: $(foreach image, ${ALL_IMAGES}, sub-build-${image}) all-build: $(foreach image, ${ALL_IMAGES}, sub-build-${image})