From b1b03b3caa54bdd1de5570081c04900ccbb1cfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 10 Apr 2024 18:48:37 +0200 Subject: [PATCH] cli-bin/windows: Add .exe extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the CLI binary in `dockereng/cli-bin` image was named `docker` regardless of platform. Change the binary name to `docker.exe` in Windows images. Signed-off-by: Paweł Gronowski (cherry picked from commit 718203d50baad771e617a50d850702e2d3ec43ec) Signed-off-by: Paweł Gronowski --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4d5533a3932..844368a9c287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,8 +123,14 @@ COPY --link . . FROM scratch AS plugins COPY --from=build-plugins /out . -FROM scratch AS bin-image +FROM scratch AS bin-image-linux COPY --from=build /out/docker /docker +FROM scratch AS bin-image-darwin +COPY --from=build /out/docker /docker +FROM scratch AS bin-image-windows +COPY --from=build /out/docker /docker.exe + +FROM bin-image-${TARGETOS} AS bin-image FROM scratch AS binary COPY --from=build /out .