From 26c782183dddc4c4eab00b200d68e5eb7ec1e67b Mon Sep 17 00:00:00 2001
From: Salman Mohammadi <salman.mohammadi@outlook.com>
Date: Fri, 4 Jul 2025 12:35:20 +0100
Subject: [PATCH] merging commands

---
 docker/Dockerfile-base         | 8 +++-----
 docker/Dockerfile-base-next    | 8 +++-----
 docker/Dockerfile-base-nightly | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base
index a6ff8de69..7cf264b03 100644
--- a/docker/Dockerfile-base
+++ b/docker/Dockerfile-base
@@ -22,7 +22,9 @@ 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 "axolotl-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/axolotl-py${PYTHON_VERSION}/bin:${PATH}"
 
@@ -37,7 +39,3 @@ RUN git lfs install --skip-repo && \
     pip3 install awscli && \
     # The base image ships with `pydantic==1.8.2` which is not working
     pip3 install -U --no-cache-dir pydantic==1.10.10
-
-# Initialize conda for bash shell to show environment in prompt
-RUN conda init bash && \
-    echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc
diff --git a/docker/Dockerfile-base-next b/docker/Dockerfile-base-next
index cd5accdb6..bfa30c864 100644
--- a/docker/Dockerfile-base-next
+++ b/docker/Dockerfile-base-next
@@ -22,7 +22,9 @@ 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 "axolotl-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/axolotl-py${PYTHON_VERSION}/bin:${PATH}"
 
@@ -36,7 +38,3 @@ RUN python3 -m pip install --upgrade pip && pip3 install packaging && \
 RUN git lfs install --skip-repo && \
     pip3 install awscli && \
     pip3 install -U --no-cache-dir pydantic==2.10.6
-
-# Initialize conda for bash shell to show environment in prompt
-RUN conda init bash && \
-    echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc
diff --git a/docker/Dockerfile-base-nightly b/docker/Dockerfile-base-nightly
index e0acca766..f76842f99 100644
--- a/docker/Dockerfile-base-nightly
+++ b/docker/Dockerfile-base-nightly
@@ -22,7 +22,9 @@ 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 "axolotl-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/axolotl-py${PYTHON_VERSION}/bin:${PATH}"
 
@@ -37,7 +39,3 @@ RUN git lfs install --skip-repo && \
     pip3 install awscli && \
     # The base image ships with `pydantic==1.8.2` which is not working
     pip3 install -U --no-cache-dir pydantic==1.10.10
-
-# Initialize conda for bash shell to show environment in prompt
-RUN conda init bash && \
-    echo "conda activate axolotl-py${PYTHON_VERSION}" >> ~/.bashrc