From 0b94be1a4b73e3b62bdc0797f259d1677f945dbf Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 13 Aug 2024 11:44:01 +0200
Subject: [PATCH] Update to Conan 2.6.0 and Cmake 3.30.2
---
README.md | 6 +--
conan-el6-gcc44-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc44-x86/Dockerfile | 8 ++--
conan-el6-gcc44/.gitlab-ci.yml | 4 +-
conan-el6-gcc44/Dockerfile | 8 ++--
conan-el6-gcc73-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc73-x86/Dockerfile | 8 ++--
conan-el6-gcc73/.gitlab-ci.yml | 4 +-
conan-el6-gcc73/Dockerfile | 8 ++--
conan-el6-gcc83-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc83-x86/Dockerfile | 8 ++--
conan-el6-gcc83/.gitlab-ci.yml | 4 +-
conan-el6-gcc83/Dockerfile | 8 ++--
conan-el6-gcc91-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc91-x86/Dockerfile | 8 ++--
conan-el6-gcc91/.gitlab-ci.yml | 4 +-
conan-el6-gcc91/Dockerfile | 8 ++--
conan-el7-gcc48-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc48-x86/Dockerfile | 8 ++--
conan-el7-gcc48/.gitlab-ci.yml | 4 +-
conan-el7-gcc48/Dockerfile | 6 +--
conan-el7-gcc73-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc73-x86/Dockerfile | 8 ++--
conan-el7-gcc73/.gitlab-ci.yml | 4 +-
conan-el7-gcc73/Dockerfile | 6 +--
conan-el7-gcc82-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc82-x86/Dockerfile | 8 ++--
conan-el7-gcc83/.gitlab-ci.yml | 4 +-
conan-el7-gcc83/Dockerfile | 6 +--
conan-el7-gcc93-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc93-x86/Dockerfile | 8 ++--
conan-el7-gcc93/.gitlab-ci.yml | 4 +-
conan-el7-gcc93/Dockerfile | 6 +--
conan-el9-gcc114/.gitlab-ci.yml | 4 +-
conan-el9-gcc114/Dockerfile | 6 +--
dependencies.dot | 72 +++++++++++++++---------------
36 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/README.md b/README.md
index fd7829c..f9b2cc3 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
All images include:
-- Conan 2.4.1 with Python 3.6.13
-- Cmake 3.29.6
+- Conan 2.6.0 with Python 3.6.13
+- Cmake 3.30.2
- Git 2.39.2
| Image | OS | Arch | GCC |
@@ -43,7 +43,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
### To build image without docker-compose with specific version of Conan
```
-$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.4.1 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
+$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.6.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
```
## Launch
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 8deb256..126956d 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index bc46b16..804b20e 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 45765c9..835dd57 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 801ca3f..58ddcab 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index d11288b..5f959d0 100644
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 5f00fd8..c25f54d 100755
--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index de87f4a..087b925 100644
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 92d2baa..d09bee0 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index 49180f0..c6546f1 100644
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index 8749a9f..495b45d 100755
--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index d0162db..48009e6 100644
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index f216634..a90bd3b 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 99ee43c..052ff72 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index 581cb56..854c778 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index 2e1bad8..e87464d 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 0d58280..3d998bc 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index ae4cbb8..513c24e 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index e06477a..4c36ecb 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 6dbb6be..6c3a952 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index 87002f0..21fdf3d 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index 2ef1820..7e8ac51 100644
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc73-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 3a98e52..d483c90 100755
--- a/conan-el7-gcc73-x86/Dockerfile
+++ b/conan-el7-gcc73-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index 01536cd..435dd49 100644
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ b/conan-el7-gcc73/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index f6589ba..cb3c757 100755
--- a/conan-el7-gcc73/Dockerfile
+++ b/conan-el7-gcc73/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index fc2e0c9..2242ba6 100644
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc82-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index f12074a..2654c43 100755
--- a/conan-el7-gcc82-x86/Dockerfile
+++ b/conan-el7-gcc82-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index 69de9f6..952253b 100644
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ b/conan-el7-gcc83/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index e6aa444..281cfa9 100755
--- a/conan-el7-gcc83/Dockerfile
+++ b/conan-el7-gcc83/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index ac880fd..982b9a8 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 2e77226..dbd884d 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 38c5d07..88d8573 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 6e59ed5..71610e2 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el9-gcc114/.gitlab-ci.yml b/conan-el9-gcc114/.gitlab-ci.yml
index 7e5d600..22f5d40 100644
--- a/conan-el9-gcc114/.gitlab-ci.yml
+++ b/conan-el9-gcc114/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/rocky-release | grep "Rocky Linux release 9"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.4"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el9-gcc114/Dockerfile b/conan-el9-gcc114/Dockerfile
index ca4e5ad..cbafbb3 100644
--- a/conan-el9-gcc114/Dockerfile
+++ b/conan-el9-gcc114/Dockerfile
@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.4.1 \
- CMAKE_VERSION=3.29.6 \
+ CONAN_VERSION=2.6.0 \
+ CMAKE_VERSION=3.30.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/dependencies.dot b/dependencies.dot
index f676f39..8d6fdc3 100644
--- a/dependencies.dot
+++ b/dependencies.dot
@@ -60,10 +60,10 @@ digraph CentOS_conan {
"git-2.39.2-linux-x86_64"
"git-2.39.2-linux-i686"
- "cmake-3.29.6-linux-i686"
+ "cmake-3.30.2-linux-i686"
- "conan-2.4.1-linux-x86_64"
- "conan-2.4.1-linux-i686"
+ "conan-2.6.0-linux-x86_64"
+ "conan-2.6.0-linux-i686"
{rank = same; "dev-el6-gcc44"; "dev-el6-gcc44-x86"; "dev-el7-gcc48"; "dev-el7-gcc48-x86"}
{rank = same; "dev-el6-gcc73"; "dev-el6-gcc83"; "dev-el6-gcc91"; "dev-el6-gcc73-x86"; "dev-el6-gcc83-x86"; "dev-el6-gcc91-x86"; "dev-el7-gcc73"; "dev-el7-gcc83"; "dev-el7-gcc93"; "dev-el7-gcc73-x86"; "dev-el7-gcc82-x86"; "dev-el7-gcc93-x86"}
@@ -129,11 +129,11 @@ digraph CentOS_conan {
"conan-el6-gcc91" -> "python-3.6.13-linux-x86_64"
"conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686"
- "dev-el6-gcc73-x86" -> "cmake-3.29.6-linux-i686"
- "dev-el7-gcc73-x86" -> "cmake-3.29.6-linux-i686"
+ "dev-el6-gcc73-x86" -> "cmake-3.30.2-linux-i686"
+ "dev-el7-gcc73-x86" -> "cmake-3.30.2-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-2.4.1-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.4.1-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.6.0-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.6.0-linux-i686"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc44"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc73"
@@ -175,33 +175,33 @@ digraph CentOS_conan {
"git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86"
"git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el6-gcc44-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el6-gcc73-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el6-gcc83-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el6-gcc91-x86"
-
- "cmake-3.29.6-linux-i686" -> "conan-el7-gcc48-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el7-gcc73-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el7-gcc82-x86"
- "cmake-3.29.6-linux-i686" -> "conan-el7-gcc93-x86"
-
- "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.4.1-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.4.1-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.4.1-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.4.1-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.4.1-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.4.1-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.4.1-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.4.1-linux-i686" -> "conan-el7-gcc93-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el6-gcc44-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el6-gcc73-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el6-gcc83-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "cmake-3.30.2-linux-i686" -> "conan-el7-gcc48-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el7-gcc73-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el7-gcc82-x86"
+ "cmake-3.30.2-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.6.0-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.6.0-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-2.6.0-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab