From c28fd130251c576dd356e4de5e19cc1bc160c6e1 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 20 Oct 2023 17:07:47 +0200
Subject: [PATCH] Update to Conan 2.0.13 and Cmake 3.27.7
---
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 | 6 +--
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 | 6 +--
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 | 6 +--
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 | 6 +--
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 +--
dependencies.dot | 72 +++++++++++++++---------------
34 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/README.md b/README.md
index 8d8551c..bcf43e7 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.0.10 with Python 3.6.13
-- Cmake 3.27.4
+- Conan 2.0.13 with Python 3.6.13
+- Cmake 3.27.7
- Git 2.39.2
| 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.10 -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.13 -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 12195e1..d76fe68 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 986b40b..82a62d4 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 814b718..2b6f2b4 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 40089eb..38a1826 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -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.10/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.13/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 6f010e6..f81c4b5 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 dde36cb..56d873f 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 fb2723f..92e2b0f 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 4a19f48..6b993bc 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -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.10/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.13/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 c8608c5..71d8058 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 1afdb6d..304cb36 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 b176336..f14c5a5 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 c359fec..c4674b8 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -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.10/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.13/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 ae60380..94f4507 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 fa07572..af870dc 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 eb1c3f3..42389e7 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 1900cf7..08227b8 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
@@ -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.10/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.13/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 a13fd9a..6c53bce 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 b87940e..b12022c 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 738b438..73ee507 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 97f68d9..ee2c924 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.0.10/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.13/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 552763d..8b594de 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 a5df02d..a0275c0 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 6ff06d3..647234d 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 00a0b17..c174832 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.0.10/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.13/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 1676899..25f242f 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 6888a77..9b3f645 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 389ab52..563b144 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 780047f..8ea2163 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.0.10/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.13/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 af36a04..f8d5292 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.27.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 e1d7381..ffefb7d 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.27.4/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.27.7/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.10/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.13/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 e7a2ec7..95668e2 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.27.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.10"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.13"
- 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 98b9eab..a583548 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.0.10 \
- CMAKE_VERSION=3.27.4 \
+ CONAN_VERSION=2.0.13 \
+ CMAKE_VERSION=3.27.7 \
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.0.10/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.13/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 03c81b4..7463464 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.27.4-linux-i686"
+ "cmake-3.27.7-linux-i686"
- "conan-2.0.10-linux-x86_64"
- "conan-2.0.10-linux-i686"
+ "conan-2.0.13-linux-x86_64"
+ "conan-2.0.13-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.27.4-linux-i686"
- "dev-el7-gcc73-x86" -> "cmake-3.27.4-linux-i686"
+ "dev-el6-gcc73-x86" -> "cmake-3.27.7-linux-i686"
+ "dev-el7-gcc73-x86" -> "cmake-3.27.7-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-2.0.10-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.0.10-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.0.13-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.0.13-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.27.4-linux-i686" -> "conan-el6-gcc44-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el6-gcc73-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el6-gcc83-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el6-gcc91-x86"
-
- "cmake-3.27.4-linux-i686" -> "conan-el7-gcc48-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el7-gcc73-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el7-gcc82-x86"
- "cmake-3.27.4-linux-i686" -> "conan-el7-gcc93-x86"
-
- "conan-2.0.10-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.0.10-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.0.10-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.0.10-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.0.10-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.0.10-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.0.10-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.0.10-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.0.10-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.0.10-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.0.10-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.0.10-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.0.10-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.0.10-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.0.10-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.0.10-linux-i686" -> "conan-el7-gcc93-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el6-gcc44-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el6-gcc73-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el6-gcc83-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "cmake-3.27.7-linux-i686" -> "conan-el7-gcc48-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el7-gcc73-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el7-gcc82-x86"
+ "cmake-3.27.7-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-2.0.13-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.0.13-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-2.0.13-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.0.13-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-2.0.13-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab