From 20ada32c5b4bfd0769bec624a6aee644b225e52b Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 4 Apr 2023 23:03:28 +0200
Subject: [PATCH] Update to Conan 2.0.3 and Cmake 3.26.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 | 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 fb7e60b..f59d11f 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.2 with Python 3.6.13
-- Cmake 3.25.2
+- Conan 2.0.3 with Python 3.6.13
+- Cmake 3.26.2
- 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.2 -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.3 -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 d5707cd..99d6ac4 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index 1ca5ba0..78f7cca 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index db67481..648558b 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 0e187f5..700999c 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.2 \
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.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index f704f90..f839e21 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 51ea77e..0483aed 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index 73f1986..66aa412 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 57e6f28..4183f99 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.2 \
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.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index d759ec4..efdfbb3 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index f282c79..b0975d0 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index 6d9a7a4..b31b360 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index b1c619f..2e7acdb 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.2 \
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.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 6488ca7..42626e7 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index c5718bd..6c950df 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index b67882c..dba41d1 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index b036b1d..3d7148e 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.2 \
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.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index c31aa9c..5cd941c 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 6de75b5..0abfcce 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 5ef738d..969428f 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index f388bd0..6fd7931 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.0.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index 53953e0..7ef5980 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index a19b35d..4fff7bc 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index 84d1794..8ada338 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index 4401b6a..fef2101 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.0.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index 44e6a40..d9566fa 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index 650783c..eeb0aea 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index 70b0343..6c082b3 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index f88b5df..bc252b3 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.0.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index aa42b3d..baeedf7 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.25.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 8b01a01..d8fae28 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.25.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.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.0.2/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.3/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index d02dec3..1000696 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.25.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.3"
release:
stage: release
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index c569fe5..da9e1ca 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.2 \
- CMAKE_VERSION=3.25.2 \
+ CONAN_VERSION=2.0.3 \
+ CMAKE_VERSION=3.26.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.0.2/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.3/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/dependencies.dot b/dependencies.dot
index 5b12104..11d770d 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.25.2-linux-i686"
+ "cmake-3.26.2-linux-i686"
- "conan-2.0.2-linux-x86_64"
- "conan-2.0.2-linux-i686"
+ "conan-2.0.3-linux-x86_64"
+ "conan-2.0.3-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.25.2-linux-i686"
- "dev-el7-gcc73-x86" -> "cmake-3.25.2-linux-i686"
+ "dev-el6-gcc73-x86" -> "cmake-3.26.2-linux-i686"
+ "dev-el7-gcc73-x86" -> "cmake-3.26.2-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-2.0.2-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.0.2-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.0.3-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.0.3-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.25.2-linux-i686" -> "conan-el6-gcc44-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el6-gcc73-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el6-gcc83-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el6-gcc91-x86"
-
- "cmake-3.25.2-linux-i686" -> "conan-el7-gcc48-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el7-gcc73-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el7-gcc82-x86"
- "cmake-3.25.2-linux-i686" -> "conan-el7-gcc93-x86"
-
- "conan-2.0.2-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.0.2-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.0.2-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.0.2-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.0.2-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.0.2-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.0.2-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.0.2-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.0.2-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.0.2-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.0.2-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.0.2-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.0.2-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.0.2-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.0.2-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.0.2-linux-i686" -> "conan-el7-gcc93-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el6-gcc44-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el6-gcc73-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el6-gcc83-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "cmake-3.26.2-linux-i686" -> "conan-el7-gcc48-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el7-gcc73-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el7-gcc82-x86"
+ "cmake-3.26.2-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.0.3-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.0.3-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-2.0.3-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab