diff --git a/README.md b/README.md index fd7829cf05d04646bbd304845fc71ba5f3abeb5f..f9b2cc3e2f18c96d017b7fe2b3f2866de2f95271 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.4.1 with Python 3.6.13 -- Cmake 3.29.6 +- Conan 2.6.0 with Python 3.6.13 +- Cmake 3.30.2 - 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.4.1 -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.6.0 -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 8deb256c58fefde0b0f7318be28d90942c1ad081..126956d7d61eea46d9c1a6281c5f61ec53fae59c 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 bc46b16b02c23c951a670bc39d7b5e071ea0fede..804b20e7f97675fa5b87cff264af6b031cf5f9f6 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 45765c94e067ad96b27ee41d3b7e0fbca6cc7801..835dd57e405823546a605c20a38ab68bb85b983b 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 801ca3f0848f4c6dfbd458d3be652331c7b04fb8..58ddcab4d34b21ff77001d1fbe7fad321690f0a8 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/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.6.0/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 d11288b9c3b6d47a351965d07e00f566c761949b..5f959d00c7c6da18bff1cdca8976d096a8ca3104 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 5f00fd87d4f1ebd66a4d71a9baf232395bbcf365..c25f54d3470fc24a20b7b1cfe49ee24411e5ec72 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 de87f4a7ce4b2ade72f54c71c709ec6babd551e6..087b9258b8e865bdfa3508c52292a9b1d006c35d 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 92d2baa7a0913de305b330956ef75708e98e78ce..d09bee006222dbc8c5afacf745ccf4c73c6a3dcb 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/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.6.0/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 49180f0dc052ff3e93f62515c4915ea34851c6e4..c6546f1b0c0cfb2051162ba4e9890d2959492321 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 8749a9fb60aa5b03248149641a233357890f6adf..495b45dc4f679bea6cfd8f49a5e4883180547156 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 d0162db887a2b0acde653735d16f959aa58c6916..48009e63975081fa49df0e83edc497456f6f4923 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 f216634c1884defcb162f57b1f40e74942532356..a90bd3b349b1b9a9791bc2ab6eadc08d1f06e9dd 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/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.6.0/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 99ee43c06c6909c3ff80abb35a1a668c967088c4..052ff7270a2b081fd6e6a08a058a2dbf73e8094a 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 581cb56cf48593ca303d6c3e52e1e79dba85fa87..854c7784bdeef914536654fe8b34bfbaac5b9843 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 2e1bad851f7e9a3a656b481c3a71758dde39d3b2..e87464dab8a7318dfd6f6cbe805c635e2d857e0b 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 0d582805d59a93a699213b2d1a16904b6541d172..3d998bc1e46f901a14117c11e1b77b170b13aa31 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/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.6.0/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 ae4cbb8bba1b2b6d7f4251b4a50dc7068e81ac50..513c24ea44500944886a587c783d11452c557fb8 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 e06477a478068cf32248418144a4bc5e51470c1d..4c36ecb8537dc53c25f8bc6018a8d88dff46e442 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 6dbb6beb36cfd95dbe6496d69631d211f8b27ea9..6c3a952d4e318746bca296e95050d328a6e3fecf 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 87002f0912200fbdb80b0441b2e18890e640157a..21fdf3de09c2b8b66ec857c05200ce307ce300e5 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.4.1/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.6.0/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 2ef1820d9057aa3a3de2cfbc88012fcd41bd24f2..7e8ac51e2501d73dad26093943a87d5aadca574b 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 3a98e52befeea4caf265b8f735a7936bf1193059..d483c90c13540bf828a595dd214e142c5ac9c250 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 01536cd82cb375439099a59fa469ca2553ce775f..435dd49973dafa69b054096e81eb3c1e6fe9f1dd 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 f6589ba1cd40ff88568c0717923b863b4b3fd7ce..cb3c7570c7f898af279c52f53ca1e5c3882f548a 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.4.1/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.6.0/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 fc2e0c9e9d66046971cc410ae93c869cfe1de1e4..2242ba68ea7457fe88aaddfdd7025f0f5d2744a7 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 f12074a4f8f98034a8ed4cc77a66f6416c4963b7..2654c4329a1c645c790e47c8a1844c94fab3d810 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 69de9f663b2bfab4159522af403412ff3d6f5885..952253bae03198d0ea9d0fe8c0b24b92be75556c 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 e6aa44415058fa79e228cd99f4f35f15c6fe069c..281cfa9657a1455360a39b067f39fcaf51ad1a7d 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.4.1/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.6.0/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 ac880fd58e187aab864e820599cdc77c871012c9..982b9a83f27b4a55d82e4861e739549da0c5b3d6 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.29.6" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 2e77226085d55299b37aeeafa59ed539c6a99b02..dbd884dd750677c758076363647be2c007c0762c 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.29.6/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/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.4.1/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/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 38c5d074c0a33627646bcb2ae9b91416d094b651..88d8573a3b28343062dfe1f661b9b73343c2c98b 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.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - 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 6e59ed5274abe456124fb097a5b3a14c3d1c7fab..71610e29e3bfa5352d3a46c66aa2b97b065baa58 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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.4.1/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.6.0/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el9-gcc114/.gitlab-ci.yml b/conan-el9-gcc114/.gitlab-ci.yml index 7e5d600ea7806d738db1d78682d233c3921b53e8..22f5d40f5dbd418c8ae1b8391753d86df51574b2 100644 --- a/conan-el9-gcc114/.gitlab-ci.yml +++ b/conan-el9-gcc114/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/rocky-release | grep "Rocky Linux release 9" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2" - 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.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el9-gcc114/Dockerfile b/conan-el9-gcc114/Dockerfile index ca4e5add07ae759ee676caf8f3dc75bbbc1cb1a9..cbafbb3d16ef291f472f0f5646876bebab24a7d5 100644 --- a/conan-el9-gcc114/Dockerfile +++ b/conan-el9-gcc114/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.4.1 \ - CMAKE_VERSION=3.29.6 \ + CONAN_VERSION=2.6.0 \ + CMAKE_VERSION=3.30.2 \ 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.4.1/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.6.0/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 f676f39f180c5782fd2c6a3c3550591094749814..8d6fdc3e2a208d09e572fa2d253028e05a9d1546 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.29.6-linux-i686" + "cmake-3.30.2-linux-i686" - "conan-2.4.1-linux-x86_64" - "conan-2.4.1-linux-i686" + "conan-2.6.0-linux-x86_64" + "conan-2.6.0-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.29.6-linux-i686" - "dev-el7-gcc73-x86" -> "cmake-3.29.6-linux-i686" + "dev-el6-gcc73-x86" -> "cmake-3.30.2-linux-i686" + "dev-el7-gcc73-x86" -> "cmake-3.30.2-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-2.4.1-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.4.1-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.6.0-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.6.0-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.29.6-linux-i686" -> "conan-el6-gcc44-x86" - "cmake-3.29.6-linux-i686" -> "conan-el6-gcc73-x86" - "cmake-3.29.6-linux-i686" -> "conan-el6-gcc83-x86" - "cmake-3.29.6-linux-i686" -> "conan-el6-gcc91-x86" - - "cmake-3.29.6-linux-i686" -> "conan-el7-gcc48-x86" - "cmake-3.29.6-linux-i686" -> "conan-el7-gcc73-x86" - "cmake-3.29.6-linux-i686" -> "conan-el7-gcc82-x86" - "cmake-3.29.6-linux-i686" -> "conan-el7-gcc93-x86" - - "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.4.1-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.4.1-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.4.1-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.4.1-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.4.1-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.4.1-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.4.1-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.4.1-linux-i686" -> "conan-el7-gcc93-x86" + "cmake-3.30.2-linux-i686" -> "conan-el6-gcc44-x86" + "cmake-3.30.2-linux-i686" -> "conan-el6-gcc73-x86" + "cmake-3.30.2-linux-i686" -> "conan-el6-gcc83-x86" + "cmake-3.30.2-linux-i686" -> "conan-el6-gcc91-x86" + + "cmake-3.30.2-linux-i686" -> "conan-el7-gcc48-x86" + "cmake-3.30.2-linux-i686" -> "conan-el7-gcc73-x86" + "cmake-3.30.2-linux-i686" -> "conan-el7-gcc82-x86" + "cmake-3.30.2-linux-i686" -> "conan-el7-gcc93-x86" + + "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.6.0-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.6.0-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.6.0-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.6.0-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.6.0-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.6.0-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.6.0-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.6.0-linux-i686" -> "conan-el7-gcc93-x86" }