Merge pull request #398 from msau42/release-3.0

k8s-ci-robot · web-flow · commit 45d61c7c72a1 · 2020-10-09T14:04:48.000-07:00
Cherry-pick #396: Fix the failing multiarch builds
diff --git a/cmd/csi-snapshotter/Dockerfile b/cmd/csi-snapshotter/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/static:latest-amd64
 LABEL maintainers="Kubernetes Authors"
 LABEL description="CSI External Snapshotter Sidecar"
 ARG binary=./bin/csi-snapshotter
diff --git a/cmd/snapshot-controller/Dockerfile b/cmd/snapshot-controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/static:latest-amd64
 LABEL maintainers="Kubernetes Authors"
 LABEL description="Snapshot Controller"
 ARG binary=./bin/snapshot-controller
diff --git a/cmd/snapshot-validation-webhook/Dockerfile b/cmd/snapshot-validation-webhook/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/base:latest
+FROM gcr.io/distroless/base:latest-amd64
 LABEL maintainers="Kubernetes Authors"
 LABEL description="Snapshot Validation Webhook"
 ARG binary=./bin/snapshot-validation-webhook

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gcr.io/distroless/static:latest`
	`1`	`+FROM gcr.io/distroless/static:latest-amd64`
`2`	`2`	`LABEL maintainers="Kubernetes Authors"`
`3`	`3`	`LABEL description="CSI External Snapshotter Sidecar"`
`4`	`4`	`ARG binary=./bin/csi-snapshotter`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gcr.io/distroless/base:latest`
	`1`	`+FROM gcr.io/distroless/base:latest-amd64`
`2`	`2`	`LABEL maintainers="Kubernetes Authors"`
`3`	`3`	`LABEL description="Snapshot Validation Webhook"`
`4`	`4`	`ARG binary=./bin/snapshot-validation-webhook`