github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100337 from claudiubelu/patch-6

Browse Source 
test images: Fixes Windows busybox image
This commit is contained in:
Kubernetes Prow Robot 2021-03-17 16:13:19 -07:00 committed by GitHub
commit 3d179220a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/busybox/Dockerfile_windows
View File

@ -57,7 +57,7 @@ RUN mkdir /curl-full /curl-dir && \
# Windows Stage # Windows Stage
FROM --platform=linux/amd64 $REGISTRY/windows-servercore-cache:1.0-linux-amd64-$OS_VERSION as servercore-helper 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 FROM $BASEIMAGE
COPY --from=prep /tmp-dir /tmp COPY --from=prep /tmp-dir /tmp