diff --git a/Makefile b/Makefile index 4e2767177..6ec60c6a2 100644 --- a/Makefile +++ b/Makefile @@ -143,17 +143,20 @@ container: smb .PHONY: container-linux container-linux: docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \ + --provenance=false --sbom=false \ -t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Dockerfile . .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 -f ./cmd/smbplugin/Dockerfile . .PHONY: container-windows container-windows: docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \ -t $(IMAGE_TAG)-windows-$(OSVERSION)-$(ARCH) --build-arg OSVERSION=$(OSVERSION) \ + --provenance=false --sbom=false \ --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Dockerfile.Windows . .PHONY: container-all diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index b5ae2d7cb..0317b6661 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. # diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh index 032da0920..7b54c35a7 100755 --- 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() {