Revert "Dockerfile/binary: Output the binary directly"

thaJeztah · thaJeztah · commit 1609916f2ce1 · 2024-01-12T22:39:30.000+01:00
Looks like this change caused docker-ce-packaging to fail; dest=$PWD/build/mac; cd /home/ubuntu/workspace/release-packaging_ce-nightly/packaging/src/github.com/docker/cli/build && for platform in *; do \ arch=$(echo $platform | cut -d_ -f2); \ mkdir -p $dest/$arch/docker; \ cp $platform/docker-darwin-* $dest/$arch/docker/docker && \ tar -C $dest/$arch -c -z -f $dest/$arch/docker-25.0.0-rc.2.tgz docker; \ done cp: cannot stat 'darwin_amd64/docker-darwin-*': No such file or directory cp: cannot stat 'darwin_arm64/docker-darwin-*': No such file or directory This reverts commit 6ad07f2. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/Dockerfile b/Dockerfile
@@ -124,4 +124,4 @@ FROM scratch AS plugins
 COPY --from=build-plugins /out .
 
 FROM scratch AS binary
-COPY --from=build /out/docker /docker
+COPY --from=build /out .
