tocmo0nlord/axolotl
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Reverts commits 79908b3c6, 083c5a042, e1ff75624, ff77fa248. (#3496)

Browse Source 
The non-root user approach had multiple issues with RunPod
compatibility, sudo PATH handling, and tmux in exec sessions.
Restoring root as the default user for now.
This commit is contained in:
Wing Lian
2026-03-13 11:54:09 -04:00
committed by GitHub
parent ff77fa2488
commit d8a05744d7
4 changed files with 36 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docker/Dockerfile-cloud-uv
View File

@@ -1,8 +1,6 @@
ARG BASE_TAG=main
FROM axolotlai/axolotl-uv:$BASE_TAG
USER root
ENV HF_DATASETS_CACHE="/workspace/data/huggingface-cache/datasets"
ENV HF_HUB_CACHE="/workspace/data/huggingface-cache/hub"
ENV HF_HOME="/workspace/data/huggingface-cache/hub"
@@ -11,7 +9,7 @@ ENV HF_HUB_ENABLE_HF_TRANSFER="1"
EXPOSE 8888
EXPOSE 22
COPY scripts/cloud-entrypoint.sh /etc/cloud-entrypoint.sh
COPY scripts/cloud-entrypoint.sh /root/cloud-entrypoint.sh
COPY scripts/motd /etc/motd
RUN uv pip install jupyterlab notebook ipywidgets && \
@@ -20,16 +18,13 @@ RUN apt update && \
apt install --yes --no-install-recommends openssh-server tmux iproute2 nvtop && \
rm -rf /var/cache/apt/archives && \
rm -rf /var/lib/apt/lists/* && \
mkdir -p /home/ubuntu/.ssh && \
chmod 700 /home/ubuntu/.ssh && \
printf "\n[[ -z \"\$TMUX\" ]] && tty -s && { tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux; exit; }\n" >> /home/ubuntu/.bashrc && \
printf "[ ! -z \"\$TERM\" -a -r /etc/motd ] && cat /etc/motd\n" >> /home/ubuntu/.bashrc && \
printf "\n[[ -z \"\$AXOLOTL_SKIP_SWITCH\" ]] && exec sudo -u ubuntu AXOLOTL_SKIP_SWITCH=1 -i\n" >> /root/.bashrc && \
chmod +x /etc/cloud-entrypoint.sh && \
echo 'set-option -g history-limit 5000' >> /home/ubuntu/.tmux.conf && \
chown -R ubuntu:ubuntu /home/ubuntu /workspace
mkdir -p ~/.ssh && \
chmod 700 ~/.ssh && \
printf "\n[[ -z \"\$TMUX\" ]] && { tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux; exit; }\n" >> ~/.bashrc && \
printf "[ ! -z \"\$TERM\" -a -r /etc/motd ] && cat /etc/motd\n" >> ~/.bashrc && \
chmod +x /workspace/axolotl/scripts/cloud-entrypoint.sh && \
chmod +x /root/cloud-entrypoint.sh && \
echo 'set-option -g history-limit 5000' >> ~/.tmux.conf
# USER ubuntu
ENTRYPOINT ["/etc/cloud-entrypoint.sh"]
ENTRYPOINT ["/root/cloud-entrypoint.sh"]
CMD ["sleep", "infinity"]

18
docker/Dockerfile-uv
View File

@@ -43,18 +43,6 @@ RUN git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && \
git config --get remote.origin.fetch && \
git config --global credential.helper store
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
COPY .axolotl-complete.bash /root/.axolotl-complete.bash
RUN chmod +x /root/.axolotl-complete.bash && \
echo 'source /root/.axolotl-complete.bash' >> ~/.bashrc

16
docker/Dockerfile-uv-base
View File

@@ -17,19 +17,13 @@ ENV TORCH_CUDA_ARCH_LIST=$TORCH_CUDA_ARCH_LIST
ENV UV_TORCH_BACKEND="cu${CUDA}"
RUN apt-get update \
&& apt-get install -y wget git build-essential ninja-build git-lfs libaio-dev pkg-config curl sudo && rm -rf /var/lib/apt/lists/* \
&& apt-get install -y wget git build-essential ninja-build git-lfs libaio-dev pkg-config curl && rm -rf /var/lib/apt/lists/* \
&& git lfs install --skip-repo \
&& curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="/usr/local/bin" sh
&& curl -LsSf https://astral.sh/uv/install.sh | sh
# Create ubuntu user with passwordless sudo
RUN useradd -m -s /bin/bash -u 1000 ubuntu 2>/dev/null; \
usermod -aG sudo ubuntu && \
echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu && \
chmod 0440 /etc/sudoers.d/ubuntu
ENV PATH="/root/.local/bin:${PATH}"
ENV UV_PYTHON_INSTALL_DIR="/opt/uv/python"
RUN uv python install ${PYTHON_VERSION} && \
chmod -R a+rX /opt/uv
RUN uv python install ${PYTHON_VERSION}
WORKDIR /workspace
@@ -61,5 +55,3 @@ RUN PYTHON_CP="cp$(echo $PYTHON_VERSION | tr -d '.')" && \
wget -nv "https://github.com/mjun0812/flash-attention-prebuild-wheels/releases/download/${WHL_VERSION}/${WHL_FILE}" && \
uv pip install --no-cache-dir "${WHL_FILE}" && \
rm "${WHL_FILE}"
RUN chown -R ubuntu:ubuntu /workspace