From e4a471e748133653354e17afa40da84fa61fe685 Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Thu, 12 Mar 2026 23:20:18 -0400 Subject: [PATCH] check ubuntu user and set uv python dir --- docker/Dockerfile-uv | 8 ++++++++ docker/Dockerfile-uv-base | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile-uv b/docker/Dockerfile-uv index f149d34105..ac03d1695e 100644 --- a/docker/Dockerfile-uv +++ b/docker/Dockerfile-uv @@ -47,6 +47,14 @@ COPY .axolotl-complete.bash /home/ubuntu/.axolotl-complete.bash RUN chmod +x /home/ubuntu/.axolotl-complete.bash && \ echo 'source /home/ubuntu/.axolotl-complete.bash' >> /home/ubuntu/.bashrc +# Ensure ubuntu user exists (may already exist from base image) +RUN id ubuntu &>/dev/null || ( \ + useradd -m -s /bin/bash -u 1000 ubuntu && \ + apt-get update && apt-get install -y --no-install-recommends sudo && rm -rf /var/lib/apt/lists/* \ + ); \ + echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu && \ + chmod 0440 /etc/sudoers.d/ubuntu + RUN chown -R ubuntu:ubuntu /workspace /home/ubuntu USER ubuntu diff --git a/docker/Dockerfile-uv-base b/docker/Dockerfile-uv-base index e6da9ac84e..378b30a033 100644 --- a/docker/Dockerfile-uv-base +++ b/docker/Dockerfile-uv-base @@ -27,7 +27,9 @@ RUN useradd -m -s /bin/bash -u 1000 ubuntu 2>/dev/null; \ echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu && \ chmod 0440 /etc/sudoers.d/ubuntu -RUN uv python install ${PYTHON_VERSION} +ENV UV_PYTHON_INSTALL_DIR="/opt/uv/python" +RUN uv python install ${PYTHON_VERSION} && \ + chmod -R a+rX /opt/uv WORKDIR /workspace