Merge pull request cyclus#1839 from cyclus/mamba-shell-dockerfile

dean-krueger · Dec 16, 2024 · 0e67ce6 · 0e67ce6
2 parents f11dcb6 + d86bf5c
commit 0e67ce6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -53,6 +53,7 @@ Since last release
 * ResTracker Extract gave the wrong parent_id to one of the child resources (#1806)
 * Support Boost v1.86 (#1792)
 * Set locale when writing/reading from serialized SQLite data (#1837)
+* Support mamba v2 CLI in Dockerfile (#1839)
 
 
 v1.6.0

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -54,10 +54,8 @@ RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
     rm ~/miniforge.sh
 
 ENV PATH=/opt/conda/bin:$PATH
-RUN mamba init bash
-SHELL ["/bin/bash", "--login",  "-c"]
 RUN mamba create -n cyclus
-SHELL ["mamba", "run", "--no-capture-output", "-n", "cyclus", "/bin/bash", "-c"]
+SHELL ["mamba", "run", "-n", "cyclus", "/bin/bash", "-c"]
 RUN mamba install -y "python<3.13" --no-pin && \
     mamba update -y --all && \
     mamba install -y \