From 327093093dd6447b2aadd61f5cdccb00cc8c28fd Mon Sep 17 00:00:00 2001 From: Claudiu Belu <1552519+claudiubelu@users.noreply.github.com> Date: Wed, 17 Mar 2021 16:51:06 +0200 Subject: [PATCH] test images: Fixes Windows busybox image The image "e2eteam/powershell-helper:6.2.7-linux-cache" is a Linux image. Because we're running "docker buildx build --platform windows/amd64", docker buildx will consider it as a Windows image unless we explicitly specify otherwise. If the image's platform is not correctly identified, we can run into problems when trying to build the image. We are already doing something similar with the windows-servercore-cache image. --- test/images/busybox/Dockerfile_windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/images/busybox/Dockerfile_windows b/test/images/busybox/Dockerfile_windows index 5a59b5ae86d..794087320fa 100644 --- a/test/images/busybox/Dockerfile_windows +++ b/test/images/busybox/Dockerfile_windows @@ -57,7 +57,7 @@ RUN mkdir /curl-full /curl-dir && \ # Windows Stage FROM --platform=linux/amd64 $REGISTRY/windows-servercore-cache:1.0-linux-amd64-$OS_VERSION as servercore-helper -FROM e2eteam/powershell-helper:6.2.7-linux-cache as ps-helper +FROM --platform=linux/amd64 e2eteam/powershell-helper:6.2.7-linux-cache as ps-helper FROM $BASEIMAGE COPY --from=prep /tmp-dir /tmp