From a864a514cb1f452e980bcbe44a82ee1f5178951e Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Mon, 17 Jul 2023 15:03:04 +0200
Subject: [PATCH] Update to Conan 2.0.8, Git 2.41.0 and Cmake 3.26.4
---
README.md | 8 +-
conan-el6-gcc44-x86/.gitlab-ci.yml | 6 +-
conan-el6-gcc44-x86/Dockerfile | 12 +--
conan-el6-gcc44/.gitlab-ci.yml | 6 +-
conan-el6-gcc44/Dockerfile | 10 +--
conan-el6-gcc73-x86/.gitlab-ci.yml | 6 +-
conan-el6-gcc73-x86/Dockerfile | 12 +--
conan-el6-gcc73/.gitlab-ci.yml | 6 +-
conan-el6-gcc73/Dockerfile | 10 +--
conan-el6-gcc83-x86/.gitlab-ci.yml | 6 +-
conan-el6-gcc83-x86/Dockerfile | 12 +--
conan-el6-gcc83/.gitlab-ci.yml | 6 +-
conan-el6-gcc83/Dockerfile | 10 +--
conan-el6-gcc91-x86/.gitlab-ci.yml | 6 +-
conan-el6-gcc91-x86/Dockerfile | 12 +--
conan-el6-gcc91/.gitlab-ci.yml | 6 +-
conan-el6-gcc91/Dockerfile | 10 +--
conan-el7-gcc48-x86/.gitlab-ci.yml | 6 +-
conan-el7-gcc48-x86/Dockerfile | 12 +--
conan-el7-gcc48/.gitlab-ci.yml | 6 +-
conan-el7-gcc48/Dockerfile | 10 +--
conan-el7-gcc73-x86/.gitlab-ci.yml | 6 +-
conan-el7-gcc73-x86/Dockerfile | 12 +--
conan-el7-gcc73/.gitlab-ci.yml | 6 +-
conan-el7-gcc73/Dockerfile | 10 +--
conan-el7-gcc82-x86/.gitlab-ci.yml | 6 +-
conan-el7-gcc82-x86/Dockerfile | 12 +--
conan-el7-gcc83/.gitlab-ci.yml | 6 +-
conan-el7-gcc83/Dockerfile | 10 +--
conan-el7-gcc93-x86/.gitlab-ci.yml | 6 +-
conan-el7-gcc93-x86/Dockerfile | 12 +--
conan-el7-gcc93/.gitlab-ci.yml | 6 +-
conan-el7-gcc93/Dockerfile | 10 +--
dependencies.dot | 120 ++++++++++++++---------------
34 files changed, 200 insertions(+), 200 deletions(-)
diff --git a/README.md b/README.md
index 8c4922c..2e904ca 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
All images include:
-- Conan 2.0.7 with Python 3.6.13
-- Cmake 3.26.2
-- Git 2.39.2
+- Conan 2.0.8 with Python 3.6.13
+- Cmake 3.26.4
+- Git 2.41.0
| Image | OS | Arch | GCC |
| ------------------- | -------------- | ------- | --------------------------------------------|
@@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
### To build image without docker-compose with specific version of Conan
```
-$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.7 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
+$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.8 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
```
## Launch
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 5e2962c..98b9ac9 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index 1901037..4e85d33 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index ada7cac..6f2b795 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 8fbad12..955d51f 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index 04578d8..67732f0 100644
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 5abbf2c..17b23d9 100755
--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index 559d146..84a1ba2 100644
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 92d7310..bd90da2 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index 199e532..194e65f 100644
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index 970908a..0e8c619 100755
--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index bd1ab44..8d99fb8 100644
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index 021fbbc..3121ed2 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 85aea16..1ae8bb5 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index 71e570c..25fe38c 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index 102e936..40358f6 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 9a58825..f14bcca 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index 0263b4e..77d908a 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 6675d09..9fd99ee 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 64aca93..bf3511f 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -28,10 +28,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index b782bc2..fd8c016 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index ea1eac3..4113e3b 100644
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc73-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 4af2b81..be2b84d 100755
--- a/conan-el7-gcc73-x86/Dockerfile
+++ b/conan-el7-gcc73-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index 7124038..72f5537 100644
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ b/conan-el7-gcc73/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index cc31fc1..5495d9a 100755
--- a/conan-el7-gcc73/Dockerfile
+++ b/conan-el7-gcc73/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index eef4fd1..5f9643f 100644
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc82-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index bce8ee2..3f15c1a 100755
--- a/conan-el7-gcc82-x86/Dockerfile
+++ b/conan-el7-gcc82-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index 9fb3281..f8d2463 100644
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ b/conan-el7-gcc83/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index fa66cdf..b5f550d 100755
--- a/conan-el7-gcc83/Dockerfile
+++ b/conan-el7-gcc83/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index b674115..56e5a9b 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 496401b..43a554c 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
- && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.2/download?job=linux-i686 \
+ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/download?job=linux-i686 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index e5faeff..5beceec 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -27,10 +27,10 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
- docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 7a59362..cab3742 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.7 \
- CMAKE_VERSION=3.26.2 \
- GIT_VERSION=2.39.2 \
+ CONAN_VERSION=2.0.8 \
+ CMAKE_VERSION=3.26.4 \
+ GIT_VERSION=2.41.0 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=x86_64
@@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${PYTHON_ROOT}.zip \
# Install git
- && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.8/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
diff --git a/dependencies.dot b/dependencies.dot
index d53fa76..27a7f0f 100644
--- a/dependencies.dot
+++ b/dependencies.dot
@@ -57,13 +57,13 @@ digraph CentOS_conan {
"python-3.6.13-linux-x86_64"
"python-3.6.13-linux-i686"
- "git-2.39.2-linux-x86_64"
- "git-2.39.2-linux-i686"
+ "git-2.41.0-linux-x86_64"
+ "git-2.41.0-linux-i686"
- "cmake-3.26.2-linux-i686"
+ "cmake-3.26.4-linux-i686"
- "conan-2.0.7-linux-x86_64"
- "conan-2.0.7-linux-i686"
+ "conan-2.0.8-linux-x86_64"
+ "conan-2.0.8-linux-i686"
{rank = same; "dev-el6-gcc44"; "dev-el6-gcc44-x86"; "dev-el7-gcc48"; "dev-el7-gcc48-x86"}
{rank = same; "dev-el6-gcc73"; "dev-el6-gcc83"; "dev-el6-gcc91"; "dev-el6-gcc73-x86"; "dev-el6-gcc83-x86"; "dev-el6-gcc91-x86"; "dev-el7-gcc73"; "dev-el7-gcc83"; "dev-el7-gcc93"; "dev-el7-gcc73-x86"; "dev-el7-gcc82-x86"; "dev-el7-gcc93-x86"}
@@ -123,17 +123,17 @@ digraph CentOS_conan {
# Use
edge [dir=back arrowtail=vee]
- "conan-el6-gcc91" -> "git-2.39.2-linux-x86_64"
- "conan-el6-gcc91-x86" -> "git-2.39.2-linux-i686"
+ "conan-el6-gcc91" -> "git-2.41.0-linux-x86_64"
+ "conan-el6-gcc91-x86" -> "git-2.41.0-linux-i686"
"conan-el6-gcc91" -> "python-3.6.13-linux-x86_64"
"conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686"
- "dev-el6-gcc73-x86" -> "cmake-3.26.2-linux-i686"
- "dev-el7-gcc73-x86" -> "cmake-3.26.2-linux-i686"
+ "dev-el6-gcc73-x86" -> "cmake-3.26.4-linux-i686"
+ "dev-el7-gcc73-x86" -> "cmake-3.26.4-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-2.0.7-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.0.7-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.0.8-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.0.8-linux-i686"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc44"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc73"
@@ -155,53 +155,53 @@ digraph CentOS_conan {
"python-3.6.13-linux-i686" -> "conan-el7-gcc82-x86"
"python-3.6.13-linux-i686" -> "conan-el7-gcc93-x86"
- "git-2.39.2-linux-x86_64" -> "conan-el6-gcc44"
- "git-2.39.2-linux-x86_64" -> "conan-el6-gcc73"
- "git-2.39.2-linux-x86_64" -> "conan-el6-gcc83"
- "git-2.39.2-linux-x86_64" -> "conan-el6-gcc91"
-
- "git-2.39.2-linux-i686" -> "conan-el6-gcc44-x86"
- "git-2.39.2-linux-i686" -> "conan-el6-gcc73-x86"
- "git-2.39.2-linux-i686" -> "conan-el6-gcc83-x86"
- "git-2.39.2-linux-i686" -> "conan-el6-gcc91-x86"
-
- "git-2.39.2-linux-x86_64" -> "conan-el7-gcc48"
- "git-2.39.2-linux-x86_64" -> "conan-el7-gcc73"
- "git-2.39.2-linux-x86_64" -> "conan-el7-gcc83"
- "git-2.39.2-linux-x86_64" -> "conan-el7-gcc93"
-
- "git-2.39.2-linux-i686" -> "conan-el7-gcc48-x86"
- "git-2.39.2-linux-i686" -> "conan-el7-gcc73-x86"
- "git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86"
- "git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86"
-
- "cmake-3.26.2-linux-i686" -> "conan-el6-gcc44-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el6-gcc73-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el6-gcc83-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el6-gcc91-x86"
-
- "cmake-3.26.2-linux-i686" -> "conan-el7-gcc48-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el7-gcc73-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el7-gcc82-x86"
- "cmake-3.26.2-linux-i686" -> "conan-el7-gcc93-x86"
-
- "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.0.7-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.0.7-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.0.7-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.0.7-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.0.7-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.0.7-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.0.7-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.0.7-linux-i686" -> "conan-el7-gcc93-x86"
+ "git-2.41.0-linux-x86_64" -> "conan-el6-gcc44"
+ "git-2.41.0-linux-x86_64" -> "conan-el6-gcc73"
+ "git-2.41.0-linux-x86_64" -> "conan-el6-gcc83"
+ "git-2.41.0-linux-x86_64" -> "conan-el6-gcc91"
+
+ "git-2.41.0-linux-i686" -> "conan-el6-gcc44-x86"
+ "git-2.41.0-linux-i686" -> "conan-el6-gcc73-x86"
+ "git-2.41.0-linux-i686" -> "conan-el6-gcc83-x86"
+ "git-2.41.0-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "git-2.41.0-linux-x86_64" -> "conan-el7-gcc48"
+ "git-2.41.0-linux-x86_64" -> "conan-el7-gcc73"
+ "git-2.41.0-linux-x86_64" -> "conan-el7-gcc83"
+ "git-2.41.0-linux-x86_64" -> "conan-el7-gcc93"
+
+ "git-2.41.0-linux-i686" -> "conan-el7-gcc48-x86"
+ "git-2.41.0-linux-i686" -> "conan-el7-gcc73-x86"
+ "git-2.41.0-linux-i686" -> "conan-el7-gcc82-x86"
+ "git-2.41.0-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "cmake-3.26.4-linux-i686" -> "conan-el6-gcc44-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el6-gcc73-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el6-gcc83-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "cmake-3.26.4-linux-i686" -> "conan-el7-gcc48-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el7-gcc73-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el7-gcc82-x86"
+ "cmake-3.26.4-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-2.0.8-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.0.8-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-2.0.8-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.0.8-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-2.0.8-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab