diff --git a/README.md b/README.md index 66fcf09435c6a197e599e00e244399ac5c72827a..25091837511da363f70b918b0ee9d8d909f8c85d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments All images include: -- Conan 2.0.4 with Python 3.6.13 +- Conan 2.0.5 with Python 3.6.13 - Cmake 3.26.2 - Git 2.39.2 @@ -49,7 +49,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.4 -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.5 -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 2e81884c6d6c1c44795a39d6f91a9652ecdd4282..29806c883b351fe896e919a3f0ac05ef74643e8d 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -31,7 +31,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 7b35e501367f88896466283c49ec44f1844226c5..ad7fe9ac7710101b1c494d47ab26123d86b54cfc 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index cb16958a5c7895e1f72df9622064cbab15402427..28dcc647ba9148a1d417ecb17ec7e79a4f28e93b 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -31,7 +31,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 12b997384f4f806d31783a727aa6b49b0bc4f958..749af0a7d6783a3e22af944a409e6e31f7b4d881 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index 80ab8a38daecbb8974ba6c8222d7c1d9f01ce7b3..f2f618c5b0ac0fad5c573b2128e0133eb048b61a 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 29a02cd4f5a399be09ad410b92496d5024dd092c..1f0ab84b19a891b386769bbc95683e2c397d74bb 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index e257f8768cf78fb5ba99045a7c92ff72ee10eef7..de4d5971399852cd3170aea6324db974b96e43bb 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index d077b743691dc100c30366507bd20d2886e785bd..9b618cad308f6fad9eaa31e9bf84c9a6d1af12b1 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 4484c2c14183536e73e6f3cd3649b62a47187794..84b52d5cbfe76e5cd8c37ee582399f6fc512f0dc 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 286279887b5b1813aadbf3ea81943653683f62ef..3865cf69d0c9e6b623668098dc80ad3698f4028e 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index 5abec774135dd1a9928133383473308e5c3e93b7..21fe5fc502a3bf2e2104ebb6b2041075e7ab0193 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 363cf77f10827999ac93795ada0edcc80d0198c0..9c73a4c5a1a555c0e5377bf02e40cb753ce22893 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index e0024edca4b73b54893f4573b264cdacaa0a8431..5c59e1f0face0432914081d3df38228fe92cca6e 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index e32078b578665612d8eca263dc977d028fb992fe..14ef2f34e24ec7afcfa7e3f52a0ddf26d8a251e1 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 511ad8f8744b3dbcb5fc74ae57c2c5284bdd9c04..ba27bcf1184bee07f90134bac6234bbba0d19308 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 9d25918288e556b65af15f37a62a0e36b9954fa2..2ca9866204f5c3a5d025d65f4a8fa8c0e36c5498 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index d838270091a50637d53c975e93b6ad1bf78ee2ab..40751cdfffb8c0b50fb0ebe22a6a61157b92c788 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -31,7 +31,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index a03bcd852a3938c86b2cdb4d14b6c6b108f3b3a5..522a90e165509840a35e5744290b29209e9770ab 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 3dc3a93e218f79b0aabe1c10c6cb2b47790e092c..c7cf891ec291f0bc54285166a999cd5768e16069 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -31,7 +31,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index 224591b2da8ce91ac1a5cb55df89293c2e215a9d..00d0c5352283bdad51f6ca2075b63558ad1d544c 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index e380308590e55af9d06b4b1d2a18c417e61e162c..5082eefac296c48c1a5b896b7316f6a95f3b1a23 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 7e0efb03db99afda2c2db3867a7ce03efc9f1fd2..5a622f4036d5a38f315e8d9e812cb8c8ce2e942a 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index b613b34c2535c4ce95b5fcb80065c14101140163..ed308ed09cbec98104c777fa67672d30de659578 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 11b436fefbb231263074403cc7807f568bb50ebe..087f0b8d2d388be8343be9da54c38a8ec977832c 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index cfeebdc50814be9df3a8ed0aa707eb099ba081cb..a9be713602bbbf838464a8c87613167ad67dd724 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index 15dfd5f5e448a01369ed51e317cdddfa3ae38fa9..d73119d81cd5b3e60f72df3f222b44fdd3881228 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index 8b45a244f6156075fa29432a8f242083178e6561..e78cd25a1ae78abecfeb78c2af5c58438581d899 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index 8f987d048e974712a32eb1ff0dfc62829140610b..fd7767de588ee59b16d320e53bdf83da217d1ab9 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 3a073a619fe496b21d5c37b05ece544f701ef082..1e4054f2907fadfd9261b9f8d194928e48c92115 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index 982de3adb910a6b02834123b1e3aa4b5b97cd4dc..0de79ab1ddf1fb6916556cc026ed3b5949144dd5 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \ && 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.4/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.5/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 6503d110fb165dfe248c70c9bf834057028fc10c..0cd17d524a46bc1e61c171e10284464cf3f65b4f 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.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.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5" release: stage: release diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index c06322a47a9e51db789b572be8ea94ebe6d7d563..3a1f3ddbbdbc5543f714d50f4525eae3a70277a6 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -3,7 +3,7 @@ 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.4 \ + CONAN_VERSION=2.0.5 \ CMAKE_VERSION=3.26.2 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ @@ -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.4/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.5/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip diff --git a/dependencies.dot b/dependencies.dot index d63dde8dceedbe3291185399fa3df7c8cea1d4fe..2a8418648354e08e3ef44e32a5d80a0fd566a6cc 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -62,8 +62,8 @@ digraph CentOS_conan { "cmake-3.26.2-linux-i686" - "conan-2.0.4-linux-x86_64" - "conan-2.0.4-linux-i686" + "conan-2.0.5-linux-x86_64" + "conan-2.0.5-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"} @@ -132,8 +132,8 @@ digraph CentOS_conan { "dev-el6-gcc73-x86" -> "cmake-3.26.2-linux-i686" "dev-el7-gcc73-x86" -> "cmake-3.26.2-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-2.0.4-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.0.4-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.0.5-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.0.5-linux-i686" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73" @@ -185,23 +185,23 @@ digraph CentOS_conan { "cmake-3.26.2-linux-i686" -> "conan-el7-gcc82-x86" "cmake-3.26.2-linux-i686" -> "conan-el7-gcc93-x86" - "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.0.4-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.0.4-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.0.4-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.0.4-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.0.4-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.0.4-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.0.4-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.0.4-linux-i686" -> "conan-el7-gcc93-x86" + "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.0.5-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.0.5-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.0.5-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.0.5-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.0.5-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.0.5-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.0.5-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.0.5-linux-i686" -> "conan-el7-gcc93-x86" }