Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docker: put uv and uvx in a single layer (#7697) 

## Summary

Copy both `uv` and `uvx` into place in a single Dockerfile command.
[`COPY` supports multiple sources when the destination is a
directory.](https://docs.docker.com/engine/reference/builder/#copy)

As it is, e.g. `ghcr.io/astral-sh/uv:0.4.16-python3.12-bookworm-slim`
has this (screenshot from [Dive](https://github.com/wagoodman/dive)):

<img width="377" alt="Screenshot 2024-09-26 at 10 11 24"
src="https://github.com/user-attachments/assets/1ca6a0d5-95fd-4210-9a4f-0afa2300b63f">

and less layers is a Good Thing.

## Test Plan

I hope the CI pipeline will take care of testing – I couldn't get the
Docker build to finish on my machine right away (SIGKILL, so out of
memory, I guess 😄)
This commit is contained in:
Aarni Koskela 2024-09-26 17:19:14 +03:00 committed by GitHub
parent 21151b591c
commit 23b010c08f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-docker.yml vendored
View File

@ -196,8 +196,7 @@ jobs:
# Generate Dockerfile content # Generate Dockerfile content
cat <<EOF > Dockerfile cat <<EOF > Dockerfile
FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}
COPY --from=${{ env.UV_BASE_IMG }}:latest /uv /usr/local/bin/uv COPY --from=${{ env.UV_BASE_IMG }}:latest /uv /uvx /usr/local/bin/
COPY --from=${{ env.UV_BASE_IMG }}:latest /uvx /usr/local/bin/uvx
ENTRYPOINT [] ENTRYPOINT []
CMD ["/usr/local/bin/uv"] CMD ["/usr/local/bin/uv"]
EOF EOF

3
Dockerfile
View File

@ -41,7 +41,6 @@ RUN cp target/$(cat rust_target.txt)/release/uv /uv \
# RUN strip --strip-all /uv # RUN strip --strip-all /uv
FROM scratch FROM scratch
COPY --from=build /uv /uv COPY --from=build /uv /uvx /
COPY --from=build /uvx /uvx
WORKDIR /io WORKDIR /io
ENTRYPOINT ["/uv"] ENTRYPOINT ["/uv"]