diff --git a/README.md b/README.md index 4b65ea43e517026a8c4a0983ffcdec71138ba36b..a957f77a18b049dcd5cc4ee0ea6c30ec590f3d67 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 1.53.0 with Python 3.6.13 +- Conan 1.54.0 with Python 3.6.13 - Cmake 3.24.2 - Git 2.36.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=1.53.0 -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=1.54.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . ``` ## Launch diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index 54a0979fc4c0f6cc28485b27cebfe1e727ed7101..617331879f4bc6412df0caabf6b6d3dd72357105 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 544be4b6f3c107c2d83f6027b1ee37d4b0124263..914018aa2673c4db52f4116b1bd3af45a47ce753 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc44-x86/README.md b/conan-el6-gcc44-x86/README.md index 88a117dc5d3a0e943eb188683172e617838582db..7a4cf19f41dd558cb97204210ca98a50e3039828 100644 --- a/conan-el6-gcc44-x86/README.md +++ b/conan-el6-gcc44-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 1fa927fc690df9c3fbafd3e3821960668a23853f..2e1d8bf1db9d9c4f330e3c88b43fb073af719c88 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 1814b84f2fe5c1c1ed98fcb2a3a773100b819cf6..7cc911a97577bf745aaa0a9d9eabea315299b5a6 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc44/README.md b/conan-el6-gcc44/README.md index e0d06af8075378b5cbcba76d50fcdf42f966bdd8..f0219a369f7b4b9cc78361b5ed96065a2a0b50a9 100644 --- a/conan-el6-gcc44/README.md +++ b/conan-el6-gcc44/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index dd02fd9be86ba831b83c3aed9b6539bde376d478..bda4d5ad484612ea31fbf15c50b446030779cb95 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 35aadd203cc77b5c8385e369bd47112318773263..6500215509428dc85787bfdd6b1962332564ea59 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc73-x86/README.md b/conan-el6-gcc73-x86/README.md index f2d08f291b45f949b478e1745dc912ffa8dd3c05..666825f65fb6fda3edecc9605385290f16c39d37 100644 --- a/conan-el6-gcc73-x86/README.md +++ b/conan-el6-gcc73-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index 2acbd67f6a2aff7fddc6adc09eade24a4ed3abe0..8bf35e81db1c3319724d742b39f7000f9d52bfe5 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index 814ff398bfe87394f1089f4ef470003466166a9b..823fbaa9a3adcd0d3b6b65fbd7ee1553faed0bf9 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc73/README.md b/conan-el6-gcc73/README.md index a090310d82a7e6a72a7ae41b88d932aca6404e52..9e010fd323aa8bb66c6a07c7844beee6134de1c4 100644 --- a/conan-el6-gcc73/README.md +++ b/conan-el6-gcc73/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 391c573290a5a0310ba6ec0d584d40921877971d..a63b0806d715c4738cf634e37d67bfe3c174d6c6 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 6e74d6ba16ac9f99f27024fa20e53d2ecf60c398..9ee8f3fffd50fcaa1cf00699e531a32fdeb9f9cb 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc83-x86/README.md b/conan-el6-gcc83-x86/README.md index fd1f27147781a6a7bf264e4722609852e59fbcf6..d69c5065b587d364332812ac80897960991bea8d 100644 --- a/conan-el6-gcc83-x86/README.md +++ b/conan-el6-gcc83-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index 3732725751e3140195e67dcc33a793375503c035..b6a4b6d47d5285cd729973eebf4ba0eb41b3eb0a 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index fccb5f4b93d05cdc085a5b7548ac8dcd9cf8d796..de3af2c85365ceacbba00132512e23885da190b7 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc83/README.md b/conan-el6-gcc83/README.md index 0f0cf30aeb206a0b2feb8d3d6f59ed57d9fccfae..1d7bdde63008e49edc7f90af89a16da5e9170747 100644 --- a/conan-el6-gcc83/README.md +++ b/conan-el6-gcc83/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index f3b5b104e237910f0770c9cd977a0e5a27fa417a..f9234079de9e41b698a83d3fcfab31746c1e106c 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index f71edeabf697aa7c2b3ef77e78f20dee11b72454..3cf2e348379f85b67b0f877fcde43fca417d893c 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc91-x86/README.md b/conan-el6-gcc91-x86/README.md index c2023206265633ea4a0428a1317daae0406f993c..1cab3d10df5703e991e5bc3964548c85a41895d7 100644 --- a/conan-el6-gcc91-x86/README.md +++ b/conan-el6-gcc91-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 8d35d914151d510af0f3a7f6b99ce06277657c37..86db2efede5a225d50f55e09a6c7d5441c3bedd0 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index f1aa8f90928b068656ae2fc5f207c7ef173f506b..b1486f4f7003183eae43695095b5985984f16a00 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el6-gcc91/README.md b/conan-el6-gcc91/README.md index 6f6139e0de12982952479aa26b691d0ec7410bf7..cb53d9ddf6cb4d995538ff54b61d974389b61110 100644 --- a/conan-el6-gcc91/README.md +++ b/conan-el6-gcc91/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index 58edb106bb420139edac23430ce3e0479aaf9641..102e79a73ba47d2ff1e67c223f746303c60dacb3 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 3fa9d870e4fc3bd5096451c8b49ab9f47d39047e..d1480a92003fa2b975f9a52f12dd5d4570e5cbd5 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc48-x86/README.md b/conan-el7-gcc48-x86/README.md index 0fb19718b3ede82f6b58b2c28e1353020312097a..b0a9a9817ed1094d03976b3de5bfc6bec44f7e77 100644 --- a/conan-el7-gcc48-x86/README.md +++ b/conan-el7-gcc48-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index eeb86ac49e9d1d6c605beeaa263053ebc501fe03..2d110fc42c9fa7d15606aa5041d2a8b9b117e39c 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index 6a33e638205c3a44df50d252b660709d38cda4b8..faa52f410e74acfe4e1a63aff65c8055ed79273a 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc48/README.md b/conan-el7-gcc48/README.md index 88cd5980b123c8756cc4804a35de814ce8edb6f2..566f1f8a2bf739cfdc9d4c213201499fdebe1341 100644 --- a/conan-el7-gcc48/README.md +++ b/conan-el7-gcc48/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index 9cd881c5ce2e098a6c8129ecdebcb4b16854fb0e..ad3485e2215d96240de4c768685803dfbe4ddd00 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 651008de34b66db445ab6d2989b94440cf6feacd..2449d627f32912c4f3e33629d1e5a9998c86896d 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc73-x86/README.md b/conan-el7-gcc73-x86/README.md index b56d4b9ede2a02313bd209cbe8881f6e8a4c225c..d046c00de04c027ee6ff96abc443d22b692cc26b 100644 --- a/conan-el7-gcc73-x86/README.md +++ b/conan-el7-gcc73-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index a155b4e3b42df468bc941106e7f6cf04e21f17a5..20a903144e75a6e83b54ce3a8d9e9c4f0242364d 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 85a760ea68f2baae146eaa9459d7a8260317ef48..3a049cb944098d81c5ac96abd7f9faa16e332e4c 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc73/README.md b/conan-el7-gcc73/README.md index cc99d7fbfb012f25f1ae246f6190d464a48734dc..8b171f42a75329c0cee67bf3d91a0c1c39618a5f 100644 --- a/conan-el7-gcc73/README.md +++ b/conan-el7-gcc73/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index 12ed6fa47569b1edabe9ec68cc030cc17f8d75c7..78c45f4dc07723da2ac0337dd7becc840b9b1e0e 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index e1cee57b0ff21e855354ffc208a308afcc93138a..0e89ad1c416205afbb7f27bf9c1fcdbb7d524489 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc82-x86/README.md b/conan-el7-gcc82-x86/README.md index 50f0aa9a69b096b8052733677af0254df2a41252..b6efb4a1d6c048859d3ce9bbd753ba8cb5dad61b 100644 --- a/conan-el7-gcc82-x86/README.md +++ b/conan-el7-gcc82-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index e27d52d91620d8452e499965faca38e80ce076c3..8f7b579228f7973ba549b6a054d357bf41bfa8d6 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index d4dff0932eb16329486aa6b4b370df2f4da362bb..3022e5cd4e09090bed47fe7c13fcd61669fea141 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc83/README.md b/conan-el7-gcc83/README.md index e722f6a6d654a4d8032fe5b00bc757651239b865..5d16303223e9e3569e9a4260048c057377dc6eb3 100644 --- a/conan-el7-gcc83/README.md +++ b/conan-el7-gcc83/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 54a4d94e3e3eba8a815eba7813222f6f36fe288a..72d06c23c4c39b7b9a497c271f1e5507a442e29b 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.24.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.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 "1.53.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index 9fafe1a16c11de048409ea350bdb6649b962187c..181f843e60e9ed12b58c2bca197d9e3568830cd3 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc93-x86/README.md b/conan-el7-gcc93-x86/README.md index 85484c594208e6cd2f108a104b7149304677c090..e15bf8140830307b2315b5452066331fab8c8676 100644 --- a/conan-el7-gcc93-x86/README.md +++ b/conan-el7-gcc93-x86/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 8e9f80a29585ef90a2fadc101dd2fce891107600..492df925154fb116d518c1f200e36c797857e8f5 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.24.2" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0" release: stage: release diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index 9878e37139337a2fb26cd7a746f2f0b12a09a9d6..01cc96b93c3b0142310d70eeeff3c00e5a62f389 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=1.53.0 \ + CONAN_VERSION=1.54.0 \ CMAKE_VERSION=3.24.2 \ GIT_VERSION=2.36.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ diff --git a/conan-el7-gcc93/README.md b/conan-el7-gcc93/README.md index 18ebfd592e9d669da868653ef9f0b46b9f4dfdc7..5792f5416f90c1aee3c2bbc5e9326fa16feaa4c7 100644 --- a/conan-el7-gcc93/README.md +++ b/conan-el7-gcc93/README.md @@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im Image includes: - Python 3.6.13 -- Conan 1.53.0 +- Conan 1.54.0 - Cmake 3.24.2 - Git 2.36.2 diff --git a/dependencies.dot b/dependencies.dot index 0e0327c9be339c7d2108a0d376e40963adeca203..a37955822d554dc12e39ea95dba09136ca9b9ab1 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -67,10 +67,10 @@ digraph CentOS_conan { "cmake-3.24.2-linux-el6-i686" "cmake-3.24.2-linux-el7-i686" - "conan-1.53.0-linux-el6-x86_64" - "conan-1.53.0-linux-el6-i686" - "conan-1.53.0-linux-el7-x86_64" - "conan-1.53.0-linux-el7-i686" + "conan-1.54.0-linux-el6-x86_64" + "conan-1.54.0-linux-el6-i686" + "conan-1.54.0-linux-el7-x86_64" + "conan-1.54.0-linux-el7-i686" # Extends edge [dir=back arrowtail=empty] @@ -125,15 +125,15 @@ digraph CentOS_conan { "dev-el6-gcc73-x86" -> "cmake-3.24.2-linux-el6-i686" "dev-el7-gcc73-x86" -> "cmake-3.24.2-linux-el7-i686" - "python-3.6.13-linux-el6-x86_64" -> "conan-1.53.0-linux-el6-x86_64" - "python-3.6.13-linux-el6-i686" -> "conan-1.53.0-linux-el6-i686" - "python-3.6.13-linux-el7-x86_64" -> "conan-1.53.0-linux-el7-x86_64" - "python-3.6.13-linux-el7-i686" -> "conan-1.53.0-linux-el7-i686" + "python-3.6.13-linux-el6-x86_64" -> "conan-1.54.0-linux-el6-x86_64" + "python-3.6.13-linux-el6-i686" -> "conan-1.54.0-linux-el6-i686" + "python-3.6.13-linux-el7-x86_64" -> "conan-1.54.0-linux-el7-x86_64" + "python-3.6.13-linux-el7-i686" -> "conan-1.54.0-linux-el7-i686" - "dev-el6-gcc44" -> "conan-1.53.0-linux-el6-x86_64" - "dev-el6-gcc44-x86" -> "conan-1.53.0-linux-el6-i686" - "dev-el7-gcc48" -> "conan-1.53.0-linux-el7-x86_64" - "dev-el7-gcc48-x86" -> "conan-1.53.0-linux-el7-i686" + "dev-el6-gcc44" -> "conan-1.54.0-linux-el6-x86_64" + "dev-el6-gcc44-x86" -> "conan-1.54.0-linux-el6-i686" + "dev-el7-gcc48" -> "conan-1.54.0-linux-el7-x86_64" + "dev-el7-gcc48-x86" -> "conan-1.54.0-linux-el7-i686" "python-3.6.13-linux-el6-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-el6-x86_64" -> "conan-el6-gcc73" @@ -185,24 +185,24 @@ digraph CentOS_conan { "cmake-3.24.2-linux-el7-i686" -> "conan-el7-gcc82-x86" "cmake-3.24.2-linux-el7-i686" -> "conan-el7-gcc93-x86" - "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc44" - "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc73" - "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc83" - "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc91" - - "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc44-x86" - "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc73-x86" - "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc83-x86" - "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc91-x86" - - "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc48" - "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc73" - "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc83" - "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc93" - - "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc48-x86" - "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc73-x86" - "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc82-x86" - "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc93-x86" + "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc44" + "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc73" + "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc83" + "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc91" + + "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc44-x86" + "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc73-x86" + "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc83-x86" + "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc91-x86" + + "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc48" + "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc73" + "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc83" + "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc93" + + "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc48-x86" + "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc73-x86" + "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc82-x86" + "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc93-x86" }