Skip to content

Commit 0e67ce6

Browse files
authored
Merge pull request cyclus#1839 from cyclus/mamba-shell-dockerfile
2 parents f11dcb6 + d86bf5c commit 0e67ce6

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CHANGELOG.rst

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Since last release
5353
* ResTracker Extract gave the wrong parent_id to one of the child resources (#1806)
5454
* Support Boost v1.86 (#1792)
5555
* Set locale when writing/reading from serialized SQLite data (#1837)
56+
* Support mamba v2 CLI in Dockerfile (#1839)
5657

5758

5859
v1.6.0

docker/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,8 @@ RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
5454
rm ~/miniforge.sh
5555

5656
ENV PATH=/opt/conda/bin:$PATH
57-
RUN mamba init bash
58-
SHELL ["/bin/bash", "--login", "-c"]
5957
RUN mamba create -n cyclus
60-
SHELL ["mamba", "run", "--no-capture-output", "-n", "cyclus", "/bin/bash", "-c"]
58+
SHELL ["mamba", "run", "-n", "cyclus", "/bin/bash", "-c"]
6159
RUN mamba install -y "python<3.13" --no-pin && \
6260
mamba update -y --all && \
6361
mamba install -y \

0 commit comments

Comments
 (0)