Skip to content

Commit

Permalink
Switch conda for mamba in docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
jthiltges authored and oshadura committed Sep 14, 2022
1 parent 007f39e commit 4b70354
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions docker/prepare-env/prepare-env-cc-analysis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -x

if [ "$EXTRA_CONDA_PACKAGES" ]; then
echo "conda: EXTRA_CONDA_PACKAGES environment variable found. Installing."
/opt/conda/bin/conda install -y $EXTRA_CONDA_PACKAGES
/opt/conda/bin/mamba install -y $EXTRA_CONDA_PACKAGES
fi

if [ "$EXTRA_PIP_PACKAGES" ]; then
Expand Down Expand Up @@ -81,10 +81,10 @@ if [[ ! -v COFFEA_CASA_SIDECAR ]]; then

if [ -e "$_CONDOR_JOB_IWD/environment.yml" ]; then
echo "Conda: environment.yml found. Installing packages."
/opt/conda/bin/conda env update -n base -f $_CONDOR_JOB_IWD/environment.yml
/opt/conda/bin/mamba env update -n base -f $_CONDOR_JOB_IWD/environment.yml
elif [ -e "$_CONDOR_JOB_IWD/environment.yaml" ]; then
echo "Conda: environment.yaml found. Installing packages."
/opt/conda/bin/conda env update -n base -f $_CONDOR_JOB_IWD/environment.yaml
/opt/conda/bin/mamba env update -n base -f $_CONDOR_JOB_IWD/environment.yaml
else
echo "No environment.yml, conda will not install any package."
fi
Expand Down
6 changes: 3 additions & 3 deletions docker/prepare-env/prepare-env-cc-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ echo "SCHEDD_HOST = ${SCHEDD_HOST}" >> /opt/condor/config.d/schedd
# Check environment
if [ -e "$HOME/environment.yml" ]; then
echo "Conda: environment.yml found. Installing packages."
/opt/conda/bin/conda env update -f $HOME/environment.yml
/opt/conda/bin/mamba env update -f $HOME/environment.yml
elif [ -e "$HOME/environment.yaml" ]; then
echo "Conda: environment.yaml found. Installing packages."
/opt/conda/bin/conda env update -f $HOME/environment.yaml
/opt/conda/bin/mamba env update -f $HOME/environment.yaml
else
echo "No environment.yml, conda will not install any package."
fi
Expand All @@ -33,7 +33,7 @@ if [ -e "$HOME/environment.yml" ]; then

if [ "$EXTRA_CONDA_PACKAGES" ]; then
echo "conda: EXTRA_CONDA_PACKAGES environment variable found. Installing."
/opt/conda/bin/conda install -y $EXTRA_CONDA_PACKAGES
/opt/conda/bin/mamba install -y $EXTRA_CONDA_PACKAGES
fi

if [ "$EXTRA_PIP_PACKAGES" ]; then
Expand Down
6 changes: 3 additions & 3 deletions docker/prepare-env/prepare-env-cc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ fi
# Check environment
if [ -e "$HOME/environment.yml" ]; then
echo "Conda: environment.yml found. Installing packages."
/opt/conda/bin/conda env update -f $HOME/environment.yml
/opt/conda/bin/mamba env update -f $HOME/environment.yml
elif [ -e "$HOME/environment.yaml" ]; then
echo "Conda: environment.yaml found. Installing packages."
/opt/conda/bin/conda env update -f $HOME/environment.yaml
/opt/conda/bin/mamba env update -f $HOME/environment.yaml
else
echo "No environment.yml, conda will not install any package."
fi
Expand All @@ -79,7 +79,7 @@ if [ -e "$HOME/environment.yml" ]; then

if [ "$EXTRA_CONDA_PACKAGES" ]; then
echo "conda: EXTRA_CONDA_PACKAGES environment variable found. Installing."
/opt/conda/bin/conda install -y $EXTRA_CONDA_PACKAGES
/opt/conda/bin/mamba install -y $EXTRA_CONDA_PACKAGES
fi

if [ "$EXTRA_PIP_PACKAGES" ]; then
Expand Down

0 comments on commit 4b70354

Please sign in to comment.