diff --git a/README.md b/README.md index 8c4922c79726dd1337c2a066c3a800535ad94bf9..2e904ca74e7fa60feeeec1e1f97e31dbd3dff398 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments All images include: -- Conan 2.0.7 with Python 3.6.13 -- Cmake 3.26.2 -- Git 2.39.2 +- Conan 2.0.8 with Python 3.6.13 +- Cmake 3.26.4 +- Git 2.41.0 | Image | OS | Arch | GCC | | ------------------- | -------------- | ------- | --------------------------------------------| @@ -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.7 -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.8 -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 5e2962c97e959d9758f86c84f047366c4822292c..98b9ac93db57c109df92815301cab00280bace55 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 190103779fd6e02ae416971ee1661831fb0dcc42..4e85d33cbab6e633f9a8775eb4c166b5fb43c145 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 ada7cac086b9c62e186b8669b3b8b6d4c922b764..6f2b7959b577b39600f8837dba8a05202a9f9fd7 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 8fbad12436b768bfcf3b35f36304c6ba0735e74a..955d51fc4f42f9093e221375a8b16ce4426fd62c 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) @@ -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.7/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.8/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 04578d852f629f2f6b2792795b3ff1a1d50b256d..67732f09bab7b0508dac7924e587efaa5a6380ef 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 5abbf2cd4d041c9c34300c699ff994ff65b76474..17b23d99edb70a7ec79e2931136852ad7b94d9cd 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 559d146931f56d6012d1f59929199fee1d0adbc2..84a1ba2356d75be4ab3eade351d72816f4cd8dad 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 92d73106846d13347a15bae7083d67b0401e4f58..bd90da22b3e2b9f53c5a6b87758f55a9945528d7 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) @@ -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.7/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.8/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 199e532c018fadbcf0853dbfe4284437715cc3cd..194e65f1e5cbb0ff3476c37c148211ef8c0d04c1 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 970908a2507ddb59a8b2239496ad5f86ab8ec3dd..0e8c619340dbe706e0501698bc3d866d5c81606b 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 bd1ab4421145912d428775aa309c220d8f3cb496..8d99fb8650fda33b238d76bb605a446f1ff2d643 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 021fbbc55f6086274f98804bb5ff5abd703753fa..3121ed200aebc659a3f26c3e8944b934fd609656 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) @@ -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.7/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.8/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 85aea16fca0fbf4f347405343a6fca586b0f564a..1ae8bb5faf3c6b8da050d26d86da8d2e975a6771 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 71e570c654efffe359adfd75b44bb24b48fb8f70..25fe38cd7d9b4b7635b5a709cf14acc02a4e19e6 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 102e93652c855cc86a6c63547c7d017e0abef061..40358f67634d1a0c99dded4e66cb1920e8b942b7 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 9a5882549b94f32f62cbf746fa541b4e39238366..f14bcca92d310aea84f4b1598a77ff2f71f63d85 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) @@ -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.7/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.8/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 0263b4e64e15daa88c16e259079a787b8d9d4113..77d908a41f0a06f396485b071644657d55fafac1 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 6675d09ff9c39427a4952941e1be2b2777a6b053..9fd99eea5cb265bc5227a11731daad2d5eed121b 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 64aca93eaaf556d306ff41d1c9b504ccb909276f..bf3511f0ade19cf63e595aa1d7c797ac31c1db3d 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 b782bc2599077300f4a5a399ac21925772be4d91..fd8c016ec26a5ce3e1fe0768455d1b808403644d 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake @@ -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.7/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.8/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 ea1eac34de70cd2c2eca66f096d41642d2604e20..4113e3b35a490b37809e4051b54f7c096af0b4c0 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 4af2b81b1b00305736e6f138626e0a1fc8f7cffa..be2b84d9c2547e20f4e921db1a01288dec85e27c 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 71240386d14a9c1131f725b423c5b2e4a93905fd..72f5537888c9f2dc473b9c81f81b64d79d49a0cd 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 cc31fc1fd0804af3cc41626b99aa8fb5e22a324a..5495d9a3edb955101baa6c927963f81f51fccae1 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake @@ -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.7/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.8/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 eef4fd1a4ca67429dcf40f09c68e656944b41279..5f9643f0be5333826c65d71a887d27fade3fa55f 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 bce8ee21c47f3327ce821800c930b69cf9abb1af..3f15c1a8f22963842d91eeecdc78eeb1c7e403e5 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 9fb3281976934bd857c9b6c5baad7d33badc99d5..f8d2463ae3df1d77e8f6a1971bc8239098f9ab8b 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 fa66cdf1ac9f47a5e89fcde26836683b41496765..b5f550d1ddf0b9616f7767d07e7665e8a9c82c41 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake @@ -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.7/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.8/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 b67411590d8416ae10ab5915cca7014d8cd0f4f2..56e5a9baf1d0cb6f0b5cacae8214d2a2a75d7c35 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.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} cmake --version | grep "3.26.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - 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.7" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 496401ba15d1f6c954b567bffb6ed94ac7817854..43a554c2c072fc71bf7f4557105b2795f2e69f6b 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \ && 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.26.2/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/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 e5faeff03bc13be985ed229436a3d170ac98a178..5beceecc3901ef2749d7af0a4e739a6d704cd565 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.26.2" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8" - 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 7a593628996531be048cdb9a0a10f2b9d3027e6c..cab3742a3963fcacae089ef78197f6ec8fb4dac6 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -3,9 +3,9 @@ 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.7 \ - CMAKE_VERSION=3.26.2 \ - GIT_VERSION=2.39.2 \ + CONAN_VERSION=2.0.8 \ + CMAKE_VERSION=3.26.4 \ + GIT_VERSION=2.41.0 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake @@ -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.7/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.8/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 d53fa767ad1f5f6b0a505e42731b52631c0d14f7..27a7f0fce9c71842612156f7f4b5f3aed8115125 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -57,13 +57,13 @@ digraph CentOS_conan { "python-3.6.13-linux-x86_64" "python-3.6.13-linux-i686" - "git-2.39.2-linux-x86_64" - "git-2.39.2-linux-i686" + "git-2.41.0-linux-x86_64" + "git-2.41.0-linux-i686" - "cmake-3.26.2-linux-i686" + "cmake-3.26.4-linux-i686" - "conan-2.0.7-linux-x86_64" - "conan-2.0.7-linux-i686" + "conan-2.0.8-linux-x86_64" + "conan-2.0.8-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"} @@ -123,17 +123,17 @@ digraph CentOS_conan { # Use edge [dir=back arrowtail=vee] - "conan-el6-gcc91" -> "git-2.39.2-linux-x86_64" - "conan-el6-gcc91-x86" -> "git-2.39.2-linux-i686" + "conan-el6-gcc91" -> "git-2.41.0-linux-x86_64" + "conan-el6-gcc91-x86" -> "git-2.41.0-linux-i686" "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.26.2-linux-i686" - "dev-el7-gcc73-x86" -> "cmake-3.26.2-linux-i686" + "dev-el6-gcc73-x86" -> "cmake-3.26.4-linux-i686" + "dev-el7-gcc73-x86" -> "cmake-3.26.4-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-2.0.7-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.0.7-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.0.8-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.0.8-linux-i686" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73" @@ -155,53 +155,53 @@ digraph CentOS_conan { "python-3.6.13-linux-i686" -> "conan-el7-gcc82-x86" "python-3.6.13-linux-i686" -> "conan-el7-gcc93-x86" - "git-2.39.2-linux-x86_64" -> "conan-el6-gcc44" - "git-2.39.2-linux-x86_64" -> "conan-el6-gcc73" - "git-2.39.2-linux-x86_64" -> "conan-el6-gcc83" - "git-2.39.2-linux-x86_64" -> "conan-el6-gcc91" - - "git-2.39.2-linux-i686" -> "conan-el6-gcc44-x86" - "git-2.39.2-linux-i686" -> "conan-el6-gcc73-x86" - "git-2.39.2-linux-i686" -> "conan-el6-gcc83-x86" - "git-2.39.2-linux-i686" -> "conan-el6-gcc91-x86" - - "git-2.39.2-linux-x86_64" -> "conan-el7-gcc48" - "git-2.39.2-linux-x86_64" -> "conan-el7-gcc73" - "git-2.39.2-linux-x86_64" -> "conan-el7-gcc83" - "git-2.39.2-linux-x86_64" -> "conan-el7-gcc93" - - "git-2.39.2-linux-i686" -> "conan-el7-gcc48-x86" - "git-2.39.2-linux-i686" -> "conan-el7-gcc73-x86" - "git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86" - "git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86" - - "cmake-3.26.2-linux-i686" -> "conan-el6-gcc44-x86" - "cmake-3.26.2-linux-i686" -> "conan-el6-gcc73-x86" - "cmake-3.26.2-linux-i686" -> "conan-el6-gcc83-x86" - "cmake-3.26.2-linux-i686" -> "conan-el6-gcc91-x86" - - "cmake-3.26.2-linux-i686" -> "conan-el7-gcc48-x86" - "cmake-3.26.2-linux-i686" -> "conan-el7-gcc73-x86" - "cmake-3.26.2-linux-i686" -> "conan-el7-gcc82-x86" - "cmake-3.26.2-linux-i686" -> "conan-el7-gcc93-x86" - - "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.0.7-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.0.7-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.0.7-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.0.7-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.0.7-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.0.7-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.0.7-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.0.7-linux-i686" -> "conan-el7-gcc93-x86" + "git-2.41.0-linux-x86_64" -> "conan-el6-gcc44" + "git-2.41.0-linux-x86_64" -> "conan-el6-gcc73" + "git-2.41.0-linux-x86_64" -> "conan-el6-gcc83" + "git-2.41.0-linux-x86_64" -> "conan-el6-gcc91" + + "git-2.41.0-linux-i686" -> "conan-el6-gcc44-x86" + "git-2.41.0-linux-i686" -> "conan-el6-gcc73-x86" + "git-2.41.0-linux-i686" -> "conan-el6-gcc83-x86" + "git-2.41.0-linux-i686" -> "conan-el6-gcc91-x86" + + "git-2.41.0-linux-x86_64" -> "conan-el7-gcc48" + "git-2.41.0-linux-x86_64" -> "conan-el7-gcc73" + "git-2.41.0-linux-x86_64" -> "conan-el7-gcc83" + "git-2.41.0-linux-x86_64" -> "conan-el7-gcc93" + + "git-2.41.0-linux-i686" -> "conan-el7-gcc48-x86" + "git-2.41.0-linux-i686" -> "conan-el7-gcc73-x86" + "git-2.41.0-linux-i686" -> "conan-el7-gcc82-x86" + "git-2.41.0-linux-i686" -> "conan-el7-gcc93-x86" + + "cmake-3.26.4-linux-i686" -> "conan-el6-gcc44-x86" + "cmake-3.26.4-linux-i686" -> "conan-el6-gcc73-x86" + "cmake-3.26.4-linux-i686" -> "conan-el6-gcc83-x86" + "cmake-3.26.4-linux-i686" -> "conan-el6-gcc91-x86" + + "cmake-3.26.4-linux-i686" -> "conan-el7-gcc48-x86" + "cmake-3.26.4-linux-i686" -> "conan-el7-gcc73-x86" + "cmake-3.26.4-linux-i686" -> "conan-el7-gcc82-x86" + "cmake-3.26.4-linux-i686" -> "conan-el7-gcc93-x86" + + "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.0.8-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.0.8-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.0.8-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.0.8-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.0.8-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.0.8-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.0.8-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.0.8-linux-i686" -> "conan-el7-gcc93-x86" }