diff --git a/Makefile b/Makefile index c90987eb..04ae1b08 100644 --- a/Makefile +++ b/Makefile @@ -87,11 +87,13 @@ nfs-armv7: .PHONY: container-build container-build: docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \ + --provenance=false --sbom=false \ -t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) . .PHONY: container-linux-armv7 container-linux-armv7: 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 . .PHONY: container diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index 63f74963..186798f5 100755 --- a/hack/boilerplate/boilerplate.py +++ b/hack/boilerplate/boilerplate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2019 The Kubernetes Authors. # @@ -199,4 +199,4 @@ def main(): return 0 if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file + sys.exit(main()) diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh index fc66718e..de126485 100644 --- a/test/external-e2e/run.sh +++ b/test/external-e2e/run.sh @@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel) DRIVER="test" install_ginkgo () { - apt update -y - apt install -y golang-ginkgo-dev + go install github.com/onsi/ginkgo/ginkgo@v1.14.0 } setup_e2e_binaries() {