Skip to content

Commit 18af03a

Browse files
committed
Test fix: update windows base image to match the version created by k8s test infra.
1 parent be73207 commit 18af03a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile.Windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ WORKDIR /code
2121
ADD . /code/
2222
RUN cd /code/ && GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=${STAGINGVERSION} make gce-pd-driver-windows
2323

24-
FROM ${BASE_IMAGE}
24+
FROM --platform=$TARGETPLATFORM ${BASE_IMAGE}
2525
LABEL description="PD CSI driver"
2626
COPY --from=builder /code/bin/gce-pd-csi-driver.exe /gce-pd-csi-driver.exe
2727

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ DRIVERWINDOWSBINARY=${DRIVERBINARY}.exe
2323

2424
DOCKER=DOCKER_CLI_EXPERIMENTAL=enabled docker
2525

26-
BASE_IMAGE_LTSC2019=mcr.microsoft.com/windows/servercore:ltsc2019
26+
BASE_IMAGE_LTSC2019=mcr.microsoft.com/windows/servercore:ltsc2022
2727

2828
# Both arrays MUST be index aligned.
29-
WINDOWS_IMAGE_TAGS=ltsc2019
29+
WINDOWS_IMAGE_TAGS=ltsc2022
3030
WINDOWS_BASE_IMAGES=$(BASE_IMAGE_LTSC2019)
3131

3232
GCFLAGS=""
@@ -55,7 +55,7 @@ build-container: require-GCE_PD_CSI_STAGING_IMAGE require-GCE_PD_CSI_STAGING_VER
5555
--push .
5656

5757
build-and-push-windows-container-ltsc2019: require-GCE_PD_CSI_STAGING_IMAGE init-buildx
58-
$(DOCKER) buildx build --file=Dockerfile.Windows --platform=windows \
58+
$(DOCKER) buildx build --file=Dockerfile.Windows --platform=windows/amd64 \
5959
-t $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019 \
6060
--build-arg BASE_IMAGE=$(BASE_IMAGE_LTSC2019) \
6161
--build-arg STAGINGVERSION=$(STAGINGVERSION) --push --provenance=false .

0 commit comments

Comments
 (0)