fix: buildx issue with provenance disabled

This commit is contained in:
andyzhangx 2023-02-09 02:49:57 +00:00
parent 3a51fd3f0c
commit b01c9f8628
3 changed files with 5 additions and 4 deletions

View File

@ -87,11 +87,13 @@ nfs-armv7:
.PHONY: container-build .PHONY: container-build
container-build: container-build:
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \ docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
--provenance=false --sbom=false \
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) . -t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) .
.PHONY: container-linux-armv7 .PHONY: container-linux-armv7
container-linux-armv7: container-linux-armv7:
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \ docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \
--provenance=false --sbom=false \
-t $(IMAGE_TAG)-linux-arm-v7 --build-arg ARCH=arm/v7 . -t $(IMAGE_TAG)-linux-arm-v7 --build-arg ARCH=arm/v7 .
.PHONY: container .PHONY: container

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2019 The Kubernetes Authors. # Copyright 2019 The Kubernetes Authors.
# #
@ -199,4 +199,4 @@ def main():
return 0 return 0
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())

View File

@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
DRIVER="test" DRIVER="test"
install_ginkgo () { install_ginkgo () {
apt update -y go install github.com/onsi/ginkgo/ginkgo@v1.14.0
apt install -y golang-ginkgo-dev
} }
setup_e2e_binaries() { setup_e2e_binaries() {