Skip to content

[UX]: Replace conda with uv in dstack's default Docker image #2625 #2652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterschmidt85 merged 4 commits into from
May 19, 2025
Merged

[UX]: Replace conda with uv in dstack's default Docker image #2625 #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db4b749
[UX]: Replace conda with uv in dstack's default Docker image #2625
peterschmidt85 May 16, 2025
cbf23db
[UX]: Replace conda with uv in dstack's default Docker image #2625
peterschmidt85 May 19, 2025
3450741
[UX]: Replace conda with uv in dstack's default Docker image #2625
peterschmidt85 May 19, 2025
ef514ec
[UX]: Replace conda with uv in dstack's default Docker image #2625
peterschmidt85 May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
uses: docker/setup-qemu-action@v3
- name: Build and upload to DockerHub
run: |
docker buildx build --platform linux/amd64 --build-arg PYTHON=${{ matrix.python }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1 -f base/Dockerfile .
docker buildx build --platform linux/amd64 --build-arg PYTHON=${{ matrix.python }} --build-arg VERSION=${{ inputs.image_version }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1-devel -f base/devel.Dockerfile .
docker buildx build --platform linux/amd64 --build-arg FLAVOR=base --build-arg PYTHON=${{ matrix.python }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1 -f base/Dockerfile .
docker buildx build --platform linux/amd64 --build-arg FLAVOR=devel --build-arg PYTHON=${{ matrix.python }} --build-arg VERSION=${{ inputs.image_version }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1-devel -f base/devel.Dockerfile .
Copy link
Copy Markdown
Collaborator

@jvstme jvstme May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also drop the deleted Dockerfile from the workflow, otherwise the workflow won't work

Suggested change
docker buildx build --platform linux/amd64 --build-arg FLAVOR=devel --build-arg PYTHON=${{ matrix.python }} --build-arg VERSION=${{ inputs.image_version }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1-devel -f base/devel.Dockerfile .
docker buildx build --platform linux/amd64 --build-arg FLAVOR=devel --build-arg PYTHON=${{ matrix.python }} --build-arg VERSION=${{ inputs.image_version }} --push --provenance=false --tag dstackai/base:py${{ matrix.python }}-${{ inputs.image_version }}-cuda-12.1-devel -f base/Dockerfile .

Copy link
Copy Markdown
Contributor Author

@peterschmidt85 peterschmidt85 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done via #2659

Comment on lines +63 to +64
Copy link
Copy Markdown
Collaborator

@jvstme jvstme May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the devel image no longer depends on the base image, it also makes sense to move FLAVOR to the job matrix (line 47), so that base and devel images can be built in parallel

Copy link
Copy Markdown
Contributor Author

@peterschmidt85 peterschmidt85 May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done via #2659


build-aws-images:
needs: build-docker
Expand Down
3 changes: 2 additions & 1 deletion docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM nvidia/cuda:12.1.0-base-ubuntu20.04
ARG FLAVOR
FROM nvidia/cuda:12.1.1-${FLAVOR}-ubuntu20.04

ARG PYTHON
ARG _UV_HOME="/opt/uv"
Expand Down
6 changes: 0 additions & 6 deletions docker/base/devel.Dockerfile
View file
Open in desktop

This file was deleted.

Loading