Skip to content

Commit 8412462

Browse files
authored
Merge pull request #734 from cpanato/cherry-pick
Add cloudbuild for gcp-compute-persistent-disk-csi-drive - cherry pick #724
2 parents 4b1d767 + f29afaf commit 8412462

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.13.4 as builder
15+
FROM golang:1.13.15 as builder
1616
WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1717
ADD . .
1818
RUN make
@@ -22,7 +22,7 @@ FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 as base
2222
RUN clean-install udev
2323

2424
# Start from Kubernetes Debian base
25-
FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
25+
FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
2626
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
2727
# Install necessary dependencies
2828
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs

Dockerfile.Windows

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE
16-
FROM --platform=$BUILDPLATFORM golang:1.13.4 AS builder
16+
FROM --platform=$BUILDPLATFORM golang:1.13.15 AS builder
1717

1818
ARG TARGETPLATFORM
1919
ARG BUILDPLATFORM

cloudbuild.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
# For more information about Image pushing refer to https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md
3+
timeout: 3600s
4+
5+
options:
6+
substitution_option: ALLOW_LOOSE
7+
8+
steps:
9+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
10+
entrypoint: make
11+
env:
12+
- GCE_PD_CSI_STAGING_IMAGE=gcr.io/${_STAGING_PROJECT}/gcp-compute-persistent-disk-csi-driver
13+
- GCE_PD_CSI_STAGING_VERSION=${_PULL_BASE_REF}
14+
# default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
15+
# set the home to /root explicitly to if using docker buildx
16+
- HOME=/root
17+
args:
18+
- build-and-push-multi-arch
19+
20+
substitutions:
21+
_STAGING_PROJECT: 'k8s-staging-cloud-provider-gcp'
22+
_PULL_BASE_REF: 'master'
23+
24+
tags:
25+
- 'gcp-compute-persistent-disk-csi-driver'
26+
- ${_PULL_BASE_REF}

0 commit comments

Comments
 (0)