Skip to content

Commit 7c0a479

Browse files
authored
Merge pull request #1205 from sunnylovestiramisu/update-gcr
Update go version and base image url in Dockerfile.debug and windows
2 parents 82d710a + 2c032b1 commit 7c0a479

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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.19.6 AS builder
16+
FROM --platform=$BUILDPLATFORM golang:1.20.3 AS builder
1717

1818
ARG TARGETPLATFORM
1919
ARG BUILDPLATFORM

Dockerfile.debug

+3-3
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.19.6 as builder
15+
FROM golang:1.20.3 as builder
1616
WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1717
ADD . .
1818

@@ -24,11 +24,11 @@ RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/g
2424
RUN GOARCH="$(echo $TARGETPLATFORM | cut -f2 -d '/')" GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION GCE_PD_CSI_DEBUG=1 make gce-pd-driver
2525

2626
# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
27-
FROM registry.k8s.io/build-image/debian-base-amd64:buster-v1.5.0 as mad-hack
27+
FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.0 as mad-hack
2828
RUN clean-install udev
2929

3030
# Start from Kubernetes Debian base
31-
FROM registry.k8s.io/build-image/debian-base-amd64:buster-v1.5.0
31+
FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.0
3232

3333
# Copy source code too to correlate the binary and the breakpoints
3434
WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver

0 commit comments

Comments
 (0)