Merge branch 'main' into print_venv

Merge branch 'print_venv' of github.com:axolotl-ai-cloud/axolotl into print_venv
reverting
2025-07-07 10:01:00 +01:00 · 2025-07-04 12:44:49 +01:00 · 2025-07-04 12:40:58 +01:00 · 2025-07-04 12:36:13 +01:00 · 2025-07-04 12:35:20 +01:00 · 2025-07-02 15:27:42 +01:00
3 changed files with 12 additions and 6 deletions
--- a/docker/Dockerfile-base
+++ b/docker/Dockerfile-base
@@ -22,9 +22,11 @@ RUN apt-get update \
    && mkdir /root/.conda \
    && bash Miniconda3-latest-Linux-x86_64.sh -b \
    && rm -f Miniconda3-latest-Linux-x86_64.sh \
-    && conda create -n "py${PYTHON_VERSION}" python="${PYTHON_VERSION}"
+    && conda create -n "axolotl-py${PYTHON_VERSION}" python="${PYTHON_VERSION}" \
+    && conda init bash \
+    && echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc

-ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}"
+ENV PATH="/root/miniconda3/envs/axolotl-py${PYTHON_VERSION}/bin:${PATH}"

 WORKDIR /workspace

--- a/docker/Dockerfile-base-next
+++ b/docker/Dockerfile-base-next
@@ -22,9 +22,11 @@ RUN apt-get update \
    && mkdir /root/.conda \
    && bash Miniconda3-latest-Linux-x86_64.sh -b \
    && rm -f Miniconda3-latest-Linux-x86_64.sh \
-    && conda create -n "py${PYTHON_VERSION}" python="${PYTHON_VERSION}"
+    && conda create -n "axolotl-py${PYTHON_VERSION}" python="${PYTHON_VERSION}" \
+    && conda init bash \
+    && echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc

-ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}"
+ENV PATH="/root/miniconda3/envs/axolotl-py${PYTHON_VERSION}/bin:${PATH}"

 WORKDIR /workspace

--- a/docker/Dockerfile-base-nightly
+++ b/docker/Dockerfile-base-nightly
@@ -22,9 +22,11 @@ RUN apt-get update \
    && mkdir /root/.conda \
    && bash Miniconda3-latest-Linux-x86_64.sh -b \
    && rm -f Miniconda3-latest-Linux-x86_64.sh \
-    && conda create -n "py${PYTHON_VERSION}" python="${PYTHON_VERSION}"
+    && conda create -n "axolotl-py${PYTHON_VERSION}" python="${PYTHON_VERSION}" \
+    && conda init bash \
+    && echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc

-ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}"
+ENV PATH="/root/miniconda3/envs/axolotl-py${PYTHON_VERSION}/bin:${PATH}"

 WORKDIR /workspace
Author	SHA1	Message	Date
salman	454eea049f	Merge branch 'main' into print_venv	2025-07-07 10:01:00 +01:00
Salman Mohammadi	d00bd99279	Merge branch 'print_venv' of github.com:axolotl-ai-cloud/axolotl into print_venv	2025-07-04 12:44:49 +01:00
Salman Mohammadi	2b41bfe9eb	reverting	2025-07-04 12:40:58 +01:00
salman	5bbbd599b4	Merge branch 'main' into print_venv	2025-07-04 12:36:13 +01:00
Salman Mohammadi	26c782183d	merging commands	2025-07-04 12:35:20 +01:00
Salman Mohammadi	8065fed126	adding venv to prompt	2025-07-02 15:27:42 +01:00