[conda] Update Miniconda version for build

jakobandersen · Jun 17, 2024 · 747e3c2 · 747e3c2
1 parent c80709a
commit 747e3c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/conda/build.Dockerfile b/conda/build.Dockerfile
@@ -2,6 +2,7 @@
 # we are trying to build against. Otherwise CMake seems to find the system Python
 # instead of the Conda Python.
 FROM ubuntu:20.04 AS build
+ARG MinicondaURL=https://repo.anaconda.com/miniconda/Miniconda3-py38_23.11.0-2-Linux-x86_64.sh
 # Based on continuumio/miniconda3
 
 #ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
@@ -10,10 +11,10 @@ ENV PATH /opt/conda/bin:$PATH
 RUN apt-get update --fix-missing                               \
  && apt-get install -y wget bzip2 ca-certificates curl git
 
-RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py38_4.12.0-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet $MinicondaURL -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh && \
-    /opt/conda/bin/conda clean -tipsy && \
+    /opt/conda/bin/conda clean -afy && \
     ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
     echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
     echo "conda activate base" >> ~/.bashrc
@@ -46,6 +47,7 @@ RUN echo "END CONDA BUILD"
 RUN echo "START INSTALLATION TEST"
 
 FROM ubuntu:20.04 AS test
+ARG MinicondaURL
 # Based on continuumio/miniconda3
 
 #ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
@@ -54,10 +56,10 @@ ENV PATH /opt/conda/bin:$PATH
 RUN apt-get update --fix-missing                               \
  && apt-get install -y wget bzip2 ca-certificates curl git
 
-RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet $MinicondaURL -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh && \
-    /opt/conda/bin/conda clean -tipsy && \
+    /opt/conda/bin/conda clean -afy && \
     ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
     echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
     echo "conda activate base" >> ~/.bashrc

diff --git a/docker/Conda.Dockerfile b/docker/Conda.Dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:22.04
+ARG MinicondaURL=https://repo.anaconda.com/miniconda/Miniconda3-py38_23.11.0-2-Linux-x86_64.sh
 ARG j=7
 # Based on continuumio/miniconda3
 
@@ -8,10 +9,10 @@ ENV PATH /opt/conda/bin:$PATH
 RUN apt-get update --fix-missing                               \
  && apt-get install -y wget bzip2 ca-certificates curl git
 
-RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py38_4.12.0-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet $MinicondaURL -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh && \
-    /opt/conda/bin/conda clean -tipsy && \
+    /opt/conda/bin/conda clean -afy && \
     ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
     echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc