From e2c87932fa16868ffbcb5bbfcf02be24f202776b Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Wed, 7 Feb 2024 13:41:16 +0100
Subject: [PATCH] Use own compiled version of cmake for CentOS 6

---
 conan-el6-gcc44/Dockerfile | 11 ++++-------
 conan-el6-gcc73/Dockerfile | 11 ++++-------
 conan-el6-gcc83/Dockerfile | 11 ++++-------
 conan-el6-gcc91/Dockerfile | 11 ++++-------
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index e211a0c..587e3f6 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -37,13 +37,10 @@ RUN groupadd 1001 -g 1001 \
     && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
     && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${GIT_ROOT}.zip \
-    # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
+    # Install cmake
+    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \
+    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
+    && rm ${CMAKE_ROOT}.zip \
     # Install conan
     && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index faea7ac..c58e7c9 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -37,13 +37,10 @@ RUN groupadd 1001 -g 1001 \
     && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
     && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${GIT_ROOT}.zip \
-    # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
+    # Install cmake
+    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \
+    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
+    && rm ${CMAKE_ROOT}.zip \
     # Install conan
     && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index c9aaa55..6fac064 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -37,13 +37,10 @@ RUN groupadd 1001 -g 1001 \
     && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
     && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${GIT_ROOT}.zip \
-    # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
+    # Install cmake
+    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \
+    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
+    && rm ${CMAKE_ROOT}.zip \
     # Install conan
     && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 0513a37..a1360bc 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -37,13 +37,10 @@ RUN groupadd 1001 -g 1001 \
     && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
     && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${GIT_ROOT}.zip \
-    # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
+    # Install cmake
+    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \
+    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
+    && rm ${CMAKE_ROOT}.zip \
     # Install conan
     && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-- 
GitLab