From 15d35b76bb0a5e60247555c3a36b78058df791d5 Mon Sep 17 00:00:00 2001 From: Dan Saunders Date: Fri, 26 Sep 2025 21:50:35 -0400 Subject: [PATCH] fixes --- .github/workflows/multi-gpu-e2e.yml | 2 +- .github/workflows/tests.yml | 6 +++--- docker/Dockerfile-cloud | 4 ++-- docker/Dockerfile-cloud-no-tmux | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/multi-gpu-e2e.yml b/.github/workflows/multi-gpu-e2e.yml index 0cf2c6468..c435e0a3a 100644 --- a/.github/workflows/multi-gpu-e2e.yml +++ b/.github/workflows/multi-gpu-e2e.yml @@ -60,7 +60,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip install --system modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 protobuf - name: Update env vars run: | echo "BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5384ffe56..15471c449 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -250,7 +250,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip install --system modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 protobuf - name: Update env vars run: | echo "BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV @@ -314,7 +314,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip install --system modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 protobuf - name: Update env vars run: | echo "BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV @@ -360,7 +360,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip install --system modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 protobuf - name: Update env vars run: | echo "BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV diff --git a/docker/Dockerfile-cloud b/docker/Dockerfile-cloud index 6ab090826..d5acb7e25 100644 --- a/docker/Dockerfile-cloud +++ b/docker/Dockerfile-cloud @@ -12,8 +12,8 @@ EXPOSE 22 COPY scripts/cloud-entrypoint.sh /root/cloud-entrypoint.sh COPY scripts/motd /etc/motd -RUN pip install jupyterlab notebook ipywidgets && \ - jupyter lab clean +RUN uv pip install --python "$VENV_PYTHON" jupyterlab notebook ipywidgets && \ + "$VENV_PYTHON" -m jupyter lab clean RUN apt update && \ apt install --yes --no-install-recommends openssh-server tmux iproute2 nvtop && \ rm -rf /var/cache/apt/archives && \ diff --git a/docker/Dockerfile-cloud-no-tmux b/docker/Dockerfile-cloud-no-tmux index 594559cfd..70379ac54 100644 --- a/docker/Dockerfile-cloud-no-tmux +++ b/docker/Dockerfile-cloud-no-tmux @@ -12,8 +12,8 @@ EXPOSE 22 COPY scripts/cloud-entrypoint.sh /root/cloud-entrypoint.sh COPY scripts/motd /etc/motd -RUN pip install jupyterlab notebook ipywidgets && \ - jupyter lab clean +RUN uv pip install --python "$VENV_PYTHON" jupyterlab notebook ipywidgets && \ + "$VENV_PYTHON" -m jupyter lab clean RUN apt update && \ apt install --yes --no-install-recommends openssh-server tmux iproute2 nvtop ibverbs-providers ibverbs-utils infiniband-diags librdmacm-dev librdmacm1 rdmacm-utils slurm-wlm && \ rm -rf /var/cache/apt/archives && \