diff --git a/Dockerfile b/Dockerfile index 44db757..728ba5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,8 +51,8 @@ RUN apt-get update > /dev/null && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -COPY install-mambaforge.bash /tmp/install-mambaforge.bash -RUN /tmp/install-mambaforge.bash +COPY install-miniforge.bash /tmp/install-miniforge.bash +RUN /tmp/install-miniforge.bash # needed for building on mac see DH-394 RUN chown -Rh ${NB_USER}:${NB_USER} ${HOME} @@ -60,7 +60,7 @@ RUN chown -Rh ${NB_USER}:${NB_USER} ${HOME} USER ${NB_USER} COPY environment.yml /tmp/environment.yml -RUN mamba env update -p ${CONDA_DIR} -f /tmp/environment.yml && \ +RUN mamba env update -q -p ${CONDA_DIR} -f /tmp/environment.yml && \ mamba clean -afy # DH-331, very similar to what was done for datahub in DH-164 diff --git a/install-mambaforge.bash b/install-miniforge.bash similarity index 80% rename from install-mambaforge.bash rename to install-miniforge.bash index 42e86ae..8c33019 100755 --- a/install-mambaforge.bash +++ b/install-miniforge.bash @@ -3,14 +3,10 @@ set -ex cd $(dirname $0) -MAMBAFORGE_VERSION=24.7.1-0 +MINIFORGE_VERSION='24.11.2-1' -URL="https://github.com/conda-forge/miniforge/releases/download/${MAMBAFORGE_VERSION}/Mambaforge-${MAMBAFORGE_VERSION}-Linux-x86_64.sh" -INSTALLER_PATH=/tmp/mambaforge-installer.sh - -# make sure we don't do anything funky with user's $HOME -# since this is run as root -unset HOME +URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${MINIFORGE_VERSION}-Linux-x86_64.sh" +INSTALLER_PATH=/tmp/miniforge-installer.sh wget --quiet $URL -O ${INSTALLER_PATH} chmod +x ${INSTALLER_PATH}