diff --git a/README.md b/README.md index 54eb18a1e7e4c6d046bc53e597a558dfe71af65e..9377ed51698a656045b9969c25e4be5d786f691f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments All images include: -- Conan 2.0.13 with Python 3.6.13 -- Cmake 3.27.7 +- Conan 2.0.17 with Python 3.6.13 +- Cmake 3.28.3 - Git 2.39.2 | Image | OS | Arch | GCC | @@ -43,7 +43,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy ### To build image without docker-compose with specific version of Conan ``` -$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.13 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . +$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.17 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . ``` ## Launch diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index d76fe688ab1eaa152f699789687995435a9db444..5d9ce971892d1624839d0c4e9709bcd9806fc2cb 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index f66f9af5b7e587c0501c88d0455e7183f9ac3d58..4742362bd63a509a10beb9d362ed89c916b39a28 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 2b6f2b4c665d87dd1c16aab58a801d567e86ec4a..877841c7f2363edfa6f496ebb94307308972853f 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index e7dc3701aa1da82ec11464643072d89dbce0e797..e211a0c3cdd73a8c11579aba4c6433bfb1104c1a 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index f81c4b5b4c705a683cdba12c073b8988a9e8e665..887724f6c0419a21ce79f9c08cd31ab10c567757 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index ae51ae26b67be23846ced285acab17986b0419bd..b5952a28d3972e267d4f6c07bbea6e6b7a487ba6 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index 92e2b0f0ed0ed48b712f32b264bc65b759a503df..78b2b8f6827fff79340e826b5fbce5ecf87f002b 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index 99153565a181b47a4ba8a6cd0c02cd0b5126c3ac..faea7acd18d992b432e44be7d599f4feb4860926 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 71d80582387253392fa865e529168cb94e221a0b..ef26d1a544acbfbffde52fc1e523765eea82b57b 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index d028e01f2f2e5f5faafc2ad16234d55e440aa3f1..7064fb4e159fa4b18cf8e9aeba1180a58e10c769 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index f14c5a5d7d0545a4c5a1cd0065c6b254df909731..b942f35b632ff1442756f217b1bd71810d2dd850 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 2c4fe526429e6dd50a5f12dc44087d2ee00c12a3..c9aaa55862218862db90c47895dcd39cf7f85e45 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index 94f450716bb295bc9fff5303faa46ccd3156af61..15a3d0ba98d4a0704808ad31f011cd7d00a55d1f 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index d67ab87dc8c879c69c1b5750c56d9366f94e829f..f1514004f7ff76530b9f01161005dae778d5e82b 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 42389e71cc4a3810e0bf43457024fde53deaf69e..84b49ab8b9be49583d6e994d5d63679a54231e7f 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 109559aff565d00ce4f41e61d1a52b121f165a47..0513a3777eeacd6206d428e2c842ef39300e57d6 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index 6c53bce843b8a4b8a4b6937fefe93d699422da0b..a85a9dc208461144de6b09a6000e36dc249d6c23 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index bb1ac4e0c56f52df181bc7185f08e90ec2145069..9c40ec73f43db4dfe1d908dceae2a87dd861b16a 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 73ee5075a66550e229b59e5654a08adf6981f68a..a68766d6d4977796371fd49f7ed5fe426172bdea 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index ad30f39b686f48fa7f1c9d07062ec6f88e3b3816..e2f0f1c99660480509ddbb682e94b82ba03e4032 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index 8b594dec52fc5546d866a9c4521d313b1bc5f09a..83b91d17b07bc7b46d965374556276cc66ea372e 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 2cdd612217bcd8247c892bc4ea474e2bbcce742b..446c1c53bf4a5dfe07461adf61fd2cc2820da5f0 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index 647234dc93495f3253e2b198e6816eead4564f22..cf0ba37df68125bf2272a9861a774f15ded42484 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 2749dcc0f6ed67c8eab42a5bfd8df097857470d0..5ed3c33b526725f2acae6eaab98129acf70c7018 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index 25f242fd42cfa4e5bcf4141257800e510519630b..565bfcddd4c64cb3c82e4c8dd0c34b1c6ad66721 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index a2637b68b4005bf3d73a71f32c2897f00f6478c5..ac589273b2c5b31445b60c9269643c172c6174db 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index 563b144f3de2914eda0d8dad88511c33bd27d363..6d147b44a23351e2ff1ef9cd460c2ac428e3c27d 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index 91612af7a5251a7d32aa7579e26a4a12059dee97..c54c9e6bd2aa20e426a63b78604d735ae7b6c591 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index f8d529203e73314f2befe22b982c0143669557e2..f10a299037814a8c62b982fc57170c743258a8c5 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index febca7a67e58987b21f148dbeffcd80928dcdadb..a7e19fae93508d214560651e0a24a4a8a6b2ced6 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/download?job=linux-i686 \ + && 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-i686 \ && 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.13/download?job=linux-i686 \ + && 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-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 95668e237832e1b908a9cf11c0cf383721786514..a4b5de59b944c39d1eda3c0495c9691d8cc89c31 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index 910558655b8deaecba769fa705eed0921353b666..cb976189d612bc6a4614e29a41dcbe3399dfbddc 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=2.0.13 \ - CMAKE_VERSION=3.27.7 \ + CONAN_VERSION=2.0.17 \ + CMAKE_VERSION=3.28.3 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/vim \ # Install conan - && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \ + && 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} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/dependencies.dot b/dependencies.dot index 74634640dc901ac7000189d024b7006104c364ae..c8042bbbcfdc89f8d8e0787d93597048b605a7ca 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -60,10 +60,10 @@ digraph CentOS_conan { "git-2.39.2-linux-x86_64" "git-2.39.2-linux-i686" - "cmake-3.27.7-linux-i686" + "cmake-3.28.3-linux-i686" - "conan-2.0.13-linux-x86_64" - "conan-2.0.13-linux-i686" + "conan-2.0.17-linux-x86_64" + "conan-2.0.17-linux-i686" {rank = same; "dev-el6-gcc44"; "dev-el6-gcc44-x86"; "dev-el7-gcc48"; "dev-el7-gcc48-x86"} {rank = same; "dev-el6-gcc73"; "dev-el6-gcc83"; "dev-el6-gcc91"; "dev-el6-gcc73-x86"; "dev-el6-gcc83-x86"; "dev-el6-gcc91-x86"; "dev-el7-gcc73"; "dev-el7-gcc83"; "dev-el7-gcc93"; "dev-el7-gcc73-x86"; "dev-el7-gcc82-x86"; "dev-el7-gcc93-x86"} @@ -129,11 +129,11 @@ digraph CentOS_conan { "conan-el6-gcc91" -> "python-3.6.13-linux-x86_64" "conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686" - "dev-el6-gcc73-x86" -> "cmake-3.27.7-linux-i686" - "dev-el7-gcc73-x86" -> "cmake-3.27.7-linux-i686" + "dev-el6-gcc73-x86" -> "cmake-3.28.3-linux-i686" + "dev-el7-gcc73-x86" -> "cmake-3.28.3-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-2.0.13-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.0.13-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.0.17-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.0.17-linux-i686" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73" @@ -175,33 +175,33 @@ digraph CentOS_conan { "git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86" "git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86" - "cmake-3.27.7-linux-i686" -> "conan-el6-gcc44-x86" - "cmake-3.27.7-linux-i686" -> "conan-el6-gcc73-x86" - "cmake-3.27.7-linux-i686" -> "conan-el6-gcc83-x86" - "cmake-3.27.7-linux-i686" -> "conan-el6-gcc91-x86" - - "cmake-3.27.7-linux-i686" -> "conan-el7-gcc48-x86" - "cmake-3.27.7-linux-i686" -> "conan-el7-gcc73-x86" - "cmake-3.27.7-linux-i686" -> "conan-el7-gcc82-x86" - "cmake-3.27.7-linux-i686" -> "conan-el7-gcc93-x86" - - "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.0.13-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.0.13-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.0.13-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.0.13-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.0.13-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.0.13-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.0.13-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.0.13-linux-i686" -> "conan-el7-gcc93-x86" + "cmake-3.28.3-linux-i686" -> "conan-el6-gcc44-x86" + "cmake-3.28.3-linux-i686" -> "conan-el6-gcc73-x86" + "cmake-3.28.3-linux-i686" -> "conan-el6-gcc83-x86" + "cmake-3.28.3-linux-i686" -> "conan-el6-gcc91-x86" + + "cmake-3.28.3-linux-i686" -> "conan-el7-gcc48-x86" + "cmake-3.28.3-linux-i686" -> "conan-el7-gcc73-x86" + "cmake-3.28.3-linux-i686" -> "conan-el7-gcc82-x86" + "cmake-3.28.3-linux-i686" -> "conan-el7-gcc93-x86" + + "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.0.17-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.0.17-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.0.17-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.0.17-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.0.17-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.0.17-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.0.17-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.0.17-linux-i686" -> "conan-el7-gcc93-x86" }