Revert "Merge branch 'update-mambaforge-version' into list_all_envs"

This reverts commit a2f6ff1, reversing changes made to 047d98b.
nebari-dev · Feb 24, 2025 · 1e6cd6e · 1e6cd6e
1 parent 416ca0a
commit 1e6cd6e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Dockerfile.dask-worker b/Dockerfile.dask-worker
@@ -15,9 +15,9 @@ RUN /opt/scripts/install-apt-minimal.sh
 
 COPY scripts/fix-permissions /opt/scripts/fix-permissions
 
-ENV MAMBAFORGE_VERSION 24.11.3-0
-ENV MAMBAFORGE_AARCH64_SHA256 d3f2b771857009ec804faeeef191352186194cb5737a831e55c6347a5f47cb8f
-ENV MAMBAFORGE_X86_64_SHA256 2e1ad2188fe69fcdd522c2b20c08c800a5c7411b775eca768318b1540ed32e53
+ENV MAMBAFORGE_VERSION 4.13.0-1
+ENV MAMBAFORGE_AARCH64_SHA256 69e3c90092f61916da7add745474e15317ed0dc6d48bfe4e4c90f359ba141d23
+ENV MAMBAFORGE_X86_64_SHA256 412b79330e90e49cf7e39a7b6f4752970fcdb8eb54b1a45cc91afe6777e8518c
 SHELL ["/bin/bash", "-c"]
 
 ENV PATH=/opt/conda/bin:${PATH}:/opt/scripts

diff --git a/Dockerfile.jupyterhub b/Dockerfile.jupyterhub
@@ -14,9 +14,9 @@ RUN /opt/scripts/install-apt-minimal.sh
 
 COPY scripts/fix-permissions /opt/scripts/fix-permissions
 
-ENV MAMBAFORGE_VERSION 24.11.3-0
-ENV MAMBAFORGE_AARCH64_SHA256 d3f2b771857009ec804faeeef191352186194cb5737a831e55c6347a5f47cb8f
-ENV MAMBAFORGE_X86_64_SHA256 2e1ad2188fe69fcdd522c2b20c08c800a5c7411b775eca768318b1540ed32e53
+ENV MAMBAFORGE_VERSION 4.13.0-1
+ENV MAMBAFORGE_AARCH64_SHA256 69e3c90092f61916da7add745474e15317ed0dc6d48bfe4e4c90f359ba141d23
+ENV MAMBAFORGE_X86_64_SHA256 412b79330e90e49cf7e39a7b6f4752970fcdb8eb54b1a45cc91afe6777e8518c
 SHELL ["/bin/bash", "-c"]
 
 ENV PATH="/opt/conda/bin:$PATH:/opt/scripts"

diff --git a/Dockerfile.jupyterlab b/Dockerfile.jupyterlab
@@ -17,9 +17,9 @@ RUN /opt/scripts/install-apt-minimal.sh
 
 COPY scripts/fix-permissions /opt/scripts/fix-permissions
 
-ENV MAMBAFORGE_VERSION 24.11.3-0
-ENV MAMBAFORGE_AARCH64_SHA256 d3f2b771857009ec804faeeef191352186194cb5737a831e55c6347a5f47cb8f
-ENV MAMBAFORGE_X86_64_SHA256 2e1ad2188fe69fcdd522c2b20c08c800a5c7411b775eca768318b1540ed32e53
+ENV MAMBAFORGE_VERSION 4.13.0-1
+ENV MAMBAFORGE_AARCH64_SHA256 69e3c90092f61916da7add745474e15317ed0dc6d48bfe4e4c90f359ba141d23
+ENV MAMBAFORGE_X86_64_SHA256 412b79330e90e49cf7e39a7b6f4752970fcdb8eb54b1a45cc91afe6777e8518c
 SHELL ["/bin/bash", "-c"]
 ENV CONDA_DIR=/opt/conda \
     DEFAULT_ENV=default

diff --git a/Dockerfile.workflow-controller b/Dockerfile.workflow-controller
@@ -17,9 +17,9 @@ RUN /opt/scripts/install-apt-minimal.sh
 
 COPY scripts/fix-permissions /opt/scripts/fix-permissions
 
-ENV MAMBAFORGE_VERSION 24.11.3-0
-ENV MAMBAFORGE_AARCH64_SHA256 d3f2b771857009ec804faeeef191352186194cb5737a831e55c6347a5f47cb8f
-ENV MAMBAFORGE_X86_64_SHA256 2e1ad2188fe69fcdd522c2b20c08c800a5c7411b775eca768318b1540ed32e53
+ENV MAMBAFORGE_VERSION 4.13.0-1
+ENV MAMBAFORGE_AARCH64_SHA256 69e3c90092f61916da7add745474e15317ed0dc6d48bfe4e4c90f359ba141d23
+ENV MAMBAFORGE_X86_64_SHA256 412b79330e90e49cf7e39a7b6f4752970fcdb8eb54b1a45cc91afe6777e8518c
 SHELL ["/bin/bash", "-c"]
 ENV CONDA_DIR=/opt/conda \
     DEFAULT_ENV=default

diff --git a/scripts/install-conda.sh b/scripts/install-conda.sh
@@ -6,7 +6,7 @@ set -xe
 
 # Requires environment MAMBAFORGE_SHA256, MINIFORGE_VERSION, and DEFAULT_ENV
 arch=$(uname -i)
-wget --quiet -O mambaforge.sh https://github.com/conda-forge/miniforge/releases/download/$MAMBAFORGE_VERSION/Miniforge3-Linux-$arch.sh
+wget --quiet -O mambaforge.sh https://github.com/conda-forge/miniforge/releases/download/$MAMBAFORGE_VERSION/Mambaforge-Linux-$arch.sh
 
 if [[ $arch == "aarch64" ]]; then
     echo "${MAMBAFORGE_AARCH64_SHA256} mambaforge.sh" >mambaforge.checksum