switched to spack-0.22.2 and cmake 3.30.5

LIHPC-Computational-Geometry · Oct 26, 2024 · c4db04e · c4db04e
1 parent 8d5d40f
commit c4db04e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/dockerfiles/Dockerfile.spack-gmds b/dockerfiles/Dockerfile.spack-gmds
@@ -1,10 +1,10 @@
 #============== OS LAYER ==================
 FROM ubuntu:22.04
 #==========================================
-ARG SPACK_VERSION=0.20.3
+ARG SPACK_VERSION=0.22.2
 # METADATA OF THE IMAGE
 LABEL description="GMDS image built with spack" \
-      version.ubuntu="22.04" \
+      version.ubuntu="24.04" \
       version.spack=${SPACK_VERSION}
 ARG SPACK_VERSION
 #==========================================
@@ -18,10 +18,14 @@ ENV TZ=Europe/Paris
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 #==========================================
 RUN apt update &&\
-    apt install -y build-essential cmake python3 python3-distutils python3-venv pip unzip zip curl git  autoconf &&\
+    apt install -y build-essential cmake python3 python3-venv pip unzip zip curl git autoconf wget &&\
     apt clean &&\
     rm -rf /var/lib/apt/lists/*
 #==========================================
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.30.5/cmake-3.30.5-linux-x86_64.tar.gz
+RUN tar xvf cmake-3.30.5-linux-x86_64.tar.gz
+RUN cp -r cmake-3.30.5-linux-x86_64/* /usr/
+#==========================================
 RUN pip install pytest
 #==========================================
 RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git &&\

diff --git a/dockerfiles/Dockerfile.spack-gmds-macos b/dockerfiles/Dockerfile.spack-gmds-macos
@@ -1,7 +1,7 @@
 #============== OS LAYER ==================
 FROM sickcodes/docker-osx
 #==========================================
-ARG SPACK_VERSION=0.20.3
+ARG SPACK_VERSION=0.22.2
 # METADATA OF THE IMAGE
 LABEL description="GMDS image built with spack for macos" \
       version.spack=${SPACK_VERSION}

diff --git a/dockerfiles/Dockerfile.spack-magix3d b/dockerfiles/Dockerfile.spack-magix3d
@@ -3,10 +3,10 @@
 # Ubuntu 22.04 allows to execute glxgears in a docker container
 FROM ubuntu:22.04
 #==========================================
-ARG SPACK_VERSION=0.20.3
+ARG SPACK_VERSION=0.22.2
 # METADATA OF THE IMAGE
 LABEL description="Magix3d image built with spack" \
-      version.ubuntu="22.04" \
+      version.ubuntu="24.04" \
       version.spack=${SPACK_VERSION}
 ARG SPACK_VERSION
 #==========================================
@@ -26,6 +26,10 @@ RUN apt update &&\
     apt clean &&\
     rm -rf /var/lib/apt/lists/*
 #==========================================
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.30.5/cmake-3.30.5-linux-x86_64.tar.gz
+RUN tar xvf cmake-3.30.5-linux-x86_64.tar.gz
+RUN cp -r cmake-3.30.5-linux-x86_64/* /usr/
+#==========================================
 # Installation of firefox for magix3d documentation (wget installed above)
 RUN wget -O FirefoxSetup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64" &&\
     tar xvf FirefoxSetup.tar.bz2 &&\