From aee7224cad5339f3dacf6912f4dd39678a24c2f9 Mon Sep 17 00:00:00 2001
From: Vismayak Mohanarajan <mohanar2@illinois.edu>
Date: Tue, 5 Dec 2023 23:56:28 -0600
Subject: [PATCH 1/2] Replacing conda with mamba

---
 Dockerfile.lab | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.lab b/Dockerfile.lab
index e33f7ae..5b12e6f 100644
--- a/Dockerfile.lab
+++ b/Dockerfile.lab
@@ -28,22 +28,21 @@ ENV INCORE=${INCORE} \
     PYINCORE_VIZ=${PYINCORE_VIZ} \
     PYINCORE_DATA=${PYINCORE_DATA}
 
-# Set conda channels and solver
-RUN conda config --add channels conda-forge && \
-    conda config --add channels in-core && \
-    conda install -c conda-forge conda-libmamba-solver && \
-    conda config --set solver libmamba
+# Install Mamba from Conda-Forge
+RUN conda install -c conda-forge mamba
 
-# install pyincore, pyincore-viz and other conda packages
-# mamba files installed will now have rw for others. Use find to collect
-# names of files installed and chane permissions.
+# Set mamba channels
+RUN mamba config --add channels conda-forge && \
+    mamba config --add channels in-core
+
+# Install pyincore, pyincore-viz and other mamba packages
 RUN umask 0 && \
   find /opt/conda ! -perm -o=w -print | sort > /tmp/oldfiles && \
-  conda install -c ${CHANNEL} -y \
+  mamba install -c ${CHANNEL} -y \
      pyincore=${PYINCORE} \
      pyincore-viz=${PYINCORE_VIZ} \
      pyincore-data=${PYINCORE_DATA} && \
-  conda clean --yes --all --force-pkgs-dirs && \
+  mamba clean --yes --all --force-pkgs-dirs && \
   find /opt/conda ! -perm -o=w -print | sort > /tmp/newfiles && \
-  comm -13 /tmp/oldfiles /tmp/newfiles | xargs  -d '\n' -n 100 chmod a+w && \
+  comm -13 /tmp/oldfiles /tmp/newfiles | xargs -d '\n' -n 100 chmod a+w && \
   rm -f /tmp/oldfiles /tmp/newfiles
\ No newline at end of file

From 6d7760ca0a67568e0db4005d35eeab74511ed3b4 Mon Sep 17 00:00:00 2001
From: Vismayak Mohanarajan <mohanar2@illinois.edu>
Date: Wed, 6 Dec 2023 10:25:38 -0600
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb13b6c..099f143 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased] - 
 
 ### Changed
-- DockerFile now uses libmamba installation to install python dependencies and github workflow is not run on ARM architecture [#75](https://github.com/IN-CORE/incore-lab/issues/75)
+- DockerFile now uses mamba to install python dependencies [#84](https://github.com/IN-CORE/incore-lab/issues/84)
+- Github workflow is not run on ARM architecture [#75](https://github.com/IN-CORE/incore-lab/issues/75)
 
 ## [1.1.0] - 2023-11-08