Skip to content

Commit

Permalink
Merge pull request #820 from andyzhangx/fix-buildx
Browse files Browse the repository at this point in the history
fix: buildx issue with provenance disabled
  • Loading branch information
andyzhangx authored Feb 9, 2023
2 parents e1f96b3 + 22b744b commit c8a4f06
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ container: blob
.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 ./pkg/blobplugin/Dockerfile .

.PHONY: blob-container
Expand Down
4 changes: 2 additions & 2 deletions hack/boilerplate/boilerplate.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# Copyright 2019 The Kubernetes Authors.
#
Expand Down Expand Up @@ -207,4 +207,4 @@ def main():
return 0

if __name__ == "__main__":
sys.exit(main())
sys.exit(main())
3 changes: 1 addition & 2 deletions test/external-e2e/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit c8a4f06

Please sign in to comment.