Skip to content

Commit de4306b

Browse files
author
Thierry RAMORASOAVINA
committed
Bump miniforge and conda versions for the image used for testing
1 parent d081ead commit de4306b

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

packaging/docker/khiopspydev/Dockerfile.debian

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ RUN true \
3232
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \
3333
# Install miniforge to have multiple Python versions via Conda \
3434
&& mkdir -p /root/miniforge3 && cd /root/miniforge3 \
35-
&& wget https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Miniforge3-24.1.2-0-Linux-x86_64.sh -O ./Miniforge3_24.1.2-0-Linux-x86_64.sh \
36-
&& echo "dbadb808edf4da00af35d888d3eeebbfdce71972b60bf4b16dbacaee2ab57f28 Miniforge3_24.1.2-0-Linux-x86_64.sh" | sha256sum --check \
37-
&& bash ./Miniforge3_24.1.2-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
38-
&& rm -rf /root/miniforge3/Miniforge3_24.1.2-0-Linux-x86_64.sh \
35+
&& wget https://github.com/conda-forge/miniforge/releases/download/25.9.1-0/Miniforge3-25.9.1-0-Linux-x86_64.sh -O ./Miniforge3_25.9.1-0-Linux-x86_64.sh \
36+
&& echo "07f64c1d908ae036e9f6a81f97704899311c0ae677d83980d664b9781d4cc5fc Miniforge3_25.9.1-0-Linux-x86_64.sh" | sha256sum --check \
37+
&& bash ./Miniforge3_25.9.1-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
38+
&& rm -rf /root/miniforge3/Miniforge3_25.9.1-0-Linux-x86_64.sh \
3939
# Make sure that MPI is openmpi \
4040
&& update-alternatives --set mpirun /usr/bin/mpirun.openmpi \
4141
# Clean build files \
@@ -66,6 +66,8 @@ RUN true \
6666
do \
6767
$CONDA create -y -n $CONDA_ENV python=${version}; \
6868
done; \
69+
# Update conda to the latest version \
70+
$CONDA update -n py${version}_conda -c conda-forge conda; \
6971
# khiops core \
7072
$CONDA install -y -n py${version}_conda ${RC_LABEL}khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
7173
# remote files drivers installed in the conda environment \

packaging/docker/khiopspydev/Dockerfile.rocky

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ RUN true \
5858
fi \
5959
# Install miniforge to have multiple Python versions via Conda \
6060
&& mkdir -p /root/miniforge3 && cd /root/miniforge3 \
61-
&& wget https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Miniforge3-24.1.2-0-Linux-x86_64.sh -O ./Miniforge3_24.1.2-0-Linux-x86_64.sh \
62-
&& echo "dbadb808edf4da00af35d888d3eeebbfdce71972b60bf4b16dbacaee2ab57f28 Miniforge3_24.1.2-0-Linux-x86_64.sh" | sha256sum --check \
63-
&& bash ./Miniforge3_24.1.2-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
64-
&& rm -rf /root/miniforge3/Miniforge3_24.1.2-0-Linux-x86_64.sh \
61+
&& wget https://github.com/conda-forge/miniforge/releases/download/25.9.1-0/Miniforge3-25.9.1-0-Linux-x86_64.sh -O ./Miniforge3_25.9.1-0-Linux-x86_64.sh \
62+
&& echo "07f64c1d908ae036e9f6a81f97704899311c0ae677d83980d664b9781d4cc5fc Miniforge3_25.9.1-0-Linux-x86_64.sh" | sha256sum --check \
63+
&& bash ./Miniforge3_25.9.1-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
64+
&& rm -rf /root/miniforge3/Miniforge3_25.9.1-0-Linux-x86_64.sh \
6565
# Clean build files \
6666
&& dnf clean all \
6767
&& rm -rf ./khiops \

packaging/docker/khiopspydev/Dockerfile.ubuntu

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ RUN true \
3030
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \
3131
# Install miniforge to have multiple Python versions via Conda \
3232
&& mkdir -p /root/miniforge3 && cd /root/miniforge3 \
33-
&& wget https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Miniforge3-24.1.2-0-Linux-x86_64.sh -O ./Miniforge3_24.1.2-0-Linux-x86_64.sh \
34-
&& echo "dbadb808edf4da00af35d888d3eeebbfdce71972b60bf4b16dbacaee2ab57f28 Miniforge3_24.1.2-0-Linux-x86_64.sh" | sha256sum --check \
35-
&& bash ./Miniforge3_24.1.2-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
36-
&& rm -rf /root/miniforge3/Miniforge3_24.1.2-0-Linux-x86_64.sh \
33+
&& wget https://github.com/conda-forge/miniforge/releases/download/25.9.1-0/Miniforge3-25.9.1-0-Linux-x86_64.sh -O ./Miniforge3-25.9.1-0-Linux-x86_64.sh \
34+
&& echo "07f64c1d908ae036e9f6a81f97704899311c0ae677d83980d664b9781d4cc5fc Miniforge3-25.9.1-0-Linux-x86_64.sh" | sha256sum --check \
35+
&& bash ./Miniforge3-25.9.1-0-Linux-x86_64.sh -b -u -p /root/miniforge3 \
36+
&& rm -rf /root/miniforge3/Miniforge3-25.9.1-0-Linux-x86_64.sh \
3737
# Make sure that MPI is openmpi \
3838
&& update-alternatives --set mpirun /usr/bin/mpirun.openmpi \
3939
# Clean build files \
@@ -64,6 +64,8 @@ RUN true \
6464
do \
6565
$CONDA create -y -n $CONDA_ENV python=${version}; \
6666
done; \
67+
# Update conda to the latest version \
68+
$CONDA update -n py${version}_conda -c conda-forge conda; \
6769
# khiops core \
6870
$CONDA install -y -n py${version}_conda ${RC_LABEL}khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
6971
# remote files drivers installed in the conda environment \

0 commit comments

Comments
 (0)