Skip to content

Commit b01c9f8

Browse files
committed
fix: buildx issue with provenance disabled
1 parent 3a51fd3 commit b01c9f8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,13 @@ nfs-armv7:
8787
.PHONY: container-build
8888
container-build:
8989
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
90+
--provenance=false --sbom=false \
9091
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) .
9192

9293
.PHONY: container-linux-armv7
9394
container-linux-armv7:
9495
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \
96+
--provenance=false --sbom=false \
9597
-t $(IMAGE_TAG)-linux-arm-v7 --build-arg ARCH=arm/v7 .
9698

9799
.PHONY: container

hack/boilerplate/boilerplate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
# Copyright 2019 The Kubernetes Authors.
44
#
@@ -199,4 +199,4 @@ def main():
199199
return 0
200200

201201
if __name__ == "__main__":
202-
sys.exit(main())
202+
sys.exit(main())

test/external-e2e/run.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
2020
DRIVER="test"
2121

2222
install_ginkgo () {
23-
apt update -y
24-
apt install -y golang-ginkgo-dev
23+
go install github.com/onsi/ginkgo/ginkgo@v1.14.0
2524
}
2625

2726
setup_e2e_binaries() {

0 commit comments

Comments
 (0)