From 2c032b13db6dc90a20e9cae40dea5b9e24361ba4 Mon Sep 17 00:00:00 2001 From: Sunny Song Date: Mon, 24 Apr 2023 16:44:03 +0000 Subject: [PATCH] Update go version and base image url in Dockerfile.debug and Dockerfile.Windows --- Dockerfile.Windows | 2 +- Dockerfile.debug | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.Windows b/Dockerfile.Windows index 091b61cda..12c0f42ad 100644 --- a/Dockerfile.Windows +++ b/Dockerfile.Windows @@ -13,7 +13,7 @@ # limitations under the License. ARG BASE_IMAGE -FROM --platform=$BUILDPLATFORM golang:1.19.6 AS builder +FROM --platform=$BUILDPLATFORM golang:1.20.3 AS builder ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/Dockerfile.debug b/Dockerfile.debug index dea29f4da..16438e3e2 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19.6 as builder +FROM golang:1.20.3 as builder WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver ADD . . @@ -24,11 +24,11 @@ RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/g RUN GOARCH="$(echo $TARGETPLATFORM | cut -f2 -d '/')" GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION GCE_PD_CSI_DEBUG=1 make gce-pd-driver # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build -FROM registry.k8s.io/build-image/debian-base-amd64:buster-v1.5.0 as mad-hack +FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.0 as mad-hack RUN clean-install udev # Start from Kubernetes Debian base -FROM registry.k8s.io/build-image/debian-base-amd64:buster-v1.5.0 +FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.0 # Copy source code too to correlate the binary and the breakpoints WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver