kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from andyzhangx/fix-buildx

Browse Source 
fix: buildx issue with provenance disabled
This commit is contained in:
Andy Zhang 2023-02-13 17:07:49 +08:00 committed by GitHub
commit 9210d20bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/trivy.yaml vendored
View File

@ -10,12 +10,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Install go - name: Install go
uses: actions/setup-go@v2 uses: actions/setup-go@v3
with: with:
go-version: ^1.16 go-version: ^1.19
- name: Build an image from Dockerfile - name: Build an image from Dockerfile
run: | run: |

2
Makefile
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

4
hack/boilerplate/boilerplate.py
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())

3
test/external-e2e/run.sh
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() {