diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index e211a0c3cdd73a8c11579aba4c6433bfb1104c1a..587e3f64334777a2da64d00ec34fb41ec25e5fe4 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 faea7acd18d992b432e44be7d599f4feb4860926..c58e7c9c03c8f3e09a64e3139029b65154fa3b6e 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 c9aaa55862218862db90c47895dcd39cf7f85e45..6fac0644d556de88d2e44fb4682512f910f24c80 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 0513a3777eeacd6206d428e2c842ef39300e57d6..a1360bcd156c577c23f9fe432f98e19431e97726 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} \