From a7be1802e919a74052f9b6e1ad8e9ccf66ac8606 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Wed, 30 Nov 2022 11:34:51 +0100
Subject: [PATCH] Update to conan 1.54.0
---
README.md | 4 +-
conan-el6-gcc44-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc44-x86/Dockerfile | 2 +-
conan-el6-gcc44-x86/README.md | 2 +-
conan-el6-gcc44/.gitlab-ci.yml | 2 +-
conan-el6-gcc44/Dockerfile | 2 +-
conan-el6-gcc44/README.md | 2 +-
conan-el6-gcc73-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc73-x86/Dockerfile | 2 +-
conan-el6-gcc73-x86/README.md | 2 +-
conan-el6-gcc73/.gitlab-ci.yml | 2 +-
conan-el6-gcc73/Dockerfile | 2 +-
conan-el6-gcc73/README.md | 2 +-
conan-el6-gcc83-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc83-x86/Dockerfile | 2 +-
conan-el6-gcc83-x86/README.md | 2 +-
conan-el6-gcc83/.gitlab-ci.yml | 2 +-
conan-el6-gcc83/Dockerfile | 2 +-
conan-el6-gcc83/README.md | 2 +-
conan-el6-gcc91-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc91-x86/Dockerfile | 2 +-
conan-el6-gcc91-x86/README.md | 2 +-
conan-el6-gcc91/.gitlab-ci.yml | 2 +-
conan-el6-gcc91/Dockerfile | 2 +-
conan-el6-gcc91/README.md | 2 +-
conan-el7-gcc48-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc48-x86/Dockerfile | 2 +-
conan-el7-gcc48-x86/README.md | 2 +-
conan-el7-gcc48/.gitlab-ci.yml | 2 +-
conan-el7-gcc48/Dockerfile | 2 +-
conan-el7-gcc48/README.md | 2 +-
conan-el7-gcc73-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc73-x86/Dockerfile | 2 +-
conan-el7-gcc73-x86/README.md | 2 +-
conan-el7-gcc73/.gitlab-ci.yml | 2 +-
conan-el7-gcc73/Dockerfile | 2 +-
conan-el7-gcc73/README.md | 2 +-
conan-el7-gcc82-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc82-x86/Dockerfile | 2 +-
conan-el7-gcc82-x86/README.md | 2 +-
conan-el7-gcc83/.gitlab-ci.yml | 2 +-
conan-el7-gcc83/Dockerfile | 2 +-
conan-el7-gcc83/README.md | 2 +-
conan-el7-gcc93-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc93-x86/Dockerfile | 2 +-
conan-el7-gcc93-x86/README.md | 2 +-
conan-el7-gcc93/.gitlab-ci.yml | 2 +-
conan-el7-gcc93/Dockerfile | 2 +-
conan-el7-gcc93/README.md | 2 +-
dependencies.dot | 62 +++++++++++++++---------------
50 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/README.md b/README.md
index 4b65ea4..a957f77 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
All images include:
-- Conan 1.53.0 with Python 3.6.13
+- Conan 1.54.0 with Python 3.6.13
- Cmake 3.24.2
- Git 2.36.2
@@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
### To build image without docker-compose with specific version of Conan
```
-$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.53.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
+$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.54.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
```
## Launch
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 54a0979..6173318 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index 544be4b..914018a 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc44-x86/README.md b/conan-el6-gcc44-x86/README.md
index 88a117d..7a4cf19 100644
--- a/conan-el6-gcc44-x86/README.md
+++ b/conan-el6-gcc44-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 1fa927f..2e1d8bf 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 1814b84..7cc911a 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc44/README.md b/conan-el6-gcc44/README.md
index e0d06af..f0219a3 100644
--- a/conan-el6-gcc44/README.md
+++ b/conan-el6-gcc44/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index dd02fd9..bda4d5a 100644
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 35aadd2..6500215 100755
--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc73-x86/README.md b/conan-el6-gcc73-x86/README.md
index f2d08f2..666825f 100644
--- a/conan-el6-gcc73-x86/README.md
+++ b/conan-el6-gcc73-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index 2acbd67..8bf35e8 100644
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 814ff39..823fbaa 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc73/README.md b/conan-el6-gcc73/README.md
index a090310..9e010fd 100644
--- a/conan-el6-gcc73/README.md
+++ b/conan-el6-gcc73/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index 391c573..a63b080 100644
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index 6e74d6b..9ee8f3f 100755
--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc83-x86/README.md b/conan-el6-gcc83-x86/README.md
index fd1f271..d69c506 100644
--- a/conan-el6-gcc83-x86/README.md
+++ b/conan-el6-gcc83-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index 3732725..b6a4b6d 100644
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index fccb5f4..de3af2c 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc83/README.md b/conan-el6-gcc83/README.md
index 0f0cf30..1d7bdde 100644
--- a/conan-el6-gcc83/README.md
+++ b/conan-el6-gcc83/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index f3b5b10..f923407 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index f71edea..3cf2e34 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc91-x86/README.md b/conan-el6-gcc91-x86/README.md
index c202320..1cab3d1 100644
--- a/conan-el6-gcc91-x86/README.md
+++ b/conan-el6-gcc91-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index 8d35d91..86db2ef 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index f1aa8f9..b1486f4 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el6-gcc91/README.md b/conan-el6-gcc91/README.md
index 6f6139e..cb53d9d 100644
--- a/conan-el6-gcc91/README.md
+++ b/conan-el6-gcc91/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index 58edb10..102e79a 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 3fa9d87..d1480a9 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc48-x86/README.md b/conan-el7-gcc48-x86/README.md
index 0fb1971..b0a9a98 100644
--- a/conan-el7-gcc48-x86/README.md
+++ b/conan-el7-gcc48-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index eeb86ac..2d110fc 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index 6a33e63..faa52f4 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc48/README.md b/conan-el7-gcc48/README.md
index 88cd598..566f1f8 100644
--- a/conan-el7-gcc48/README.md
+++ b/conan-el7-gcc48/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index 9cd881c..ad3485e 100644
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc73-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 651008d..2449d62 100755
--- a/conan-el7-gcc73-x86/Dockerfile
+++ b/conan-el7-gcc73-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc73-x86/README.md b/conan-el7-gcc73-x86/README.md
index b56d4b9..d046c00 100644
--- a/conan-el7-gcc73-x86/README.md
+++ b/conan-el7-gcc73-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index a155b4e..20a9031 100644
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ b/conan-el7-gcc73/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index 85a760e..3a049cb 100755
--- a/conan-el7-gcc73/Dockerfile
+++ b/conan-el7-gcc73/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc73/README.md b/conan-el7-gcc73/README.md
index cc99d7f..8b171f4 100644
--- a/conan-el7-gcc73/README.md
+++ b/conan-el7-gcc73/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index 12ed6fa..78c45f4 100644
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc82-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index e1cee57..0e89ad1 100755
--- a/conan-el7-gcc82-x86/Dockerfile
+++ b/conan-el7-gcc82-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc82-x86/README.md b/conan-el7-gcc82-x86/README.md
index 50f0aa9..b6efb4a 100644
--- a/conan-el7-gcc82-x86/README.md
+++ b/conan-el7-gcc82-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index e27d52d..8f7b579 100644
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ b/conan-el7-gcc83/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index d4dff09..3022e5c 100755
--- a/conan-el7-gcc83/Dockerfile
+++ b/conan-el7-gcc83/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc83/README.md b/conan-el7-gcc83/README.md
index e722f6a..5d16303 100644
--- a/conan-el7-gcc83/README.md
+++ b/conan-el7-gcc83/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index 54a4d94..72d06c2 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 9fafe1a..181f843 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc93-x86/README.md b/conan-el7-gcc93-x86/README.md
index 85484c5..e15bf81 100644
--- a/conan-el7-gcc93-x86/README.md
+++ b/conan-el7-gcc93-x86/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 8e9f80a..492df92 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.53.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
release:
stage: release
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 9878e37..01cc96b 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=1.53.0 \
+ CONAN_VERSION=1.54.0 \
CMAKE_VERSION=3.24.2 \
GIT_VERSION=2.36.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
diff --git a/conan-el7-gcc93/README.md b/conan-el7-gcc93/README.md
index 18ebfd5..5792f54 100644
--- a/conan-el7-gcc93/README.md
+++ b/conan-el7-gcc93/README.md
@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
Image includes:
- Python 3.6.13
-- Conan 1.53.0
+- Conan 1.54.0
- Cmake 3.24.2
- Git 2.36.2
diff --git a/dependencies.dot b/dependencies.dot
index 0e0327c..a379558 100644
--- a/dependencies.dot
+++ b/dependencies.dot
@@ -67,10 +67,10 @@ digraph CentOS_conan {
"cmake-3.24.2-linux-el6-i686"
"cmake-3.24.2-linux-el7-i686"
- "conan-1.53.0-linux-el6-x86_64"
- "conan-1.53.0-linux-el6-i686"
- "conan-1.53.0-linux-el7-x86_64"
- "conan-1.53.0-linux-el7-i686"
+ "conan-1.54.0-linux-el6-x86_64"
+ "conan-1.54.0-linux-el6-i686"
+ "conan-1.54.0-linux-el7-x86_64"
+ "conan-1.54.0-linux-el7-i686"
# Extends
edge [dir=back arrowtail=empty]
@@ -125,15 +125,15 @@ digraph CentOS_conan {
"dev-el6-gcc73-x86" -> "cmake-3.24.2-linux-el6-i686"
"dev-el7-gcc73-x86" -> "cmake-3.24.2-linux-el7-i686"
- "python-3.6.13-linux-el6-x86_64" -> "conan-1.53.0-linux-el6-x86_64"
- "python-3.6.13-linux-el6-i686" -> "conan-1.53.0-linux-el6-i686"
- "python-3.6.13-linux-el7-x86_64" -> "conan-1.53.0-linux-el7-x86_64"
- "python-3.6.13-linux-el7-i686" -> "conan-1.53.0-linux-el7-i686"
+ "python-3.6.13-linux-el6-x86_64" -> "conan-1.54.0-linux-el6-x86_64"
+ "python-3.6.13-linux-el6-i686" -> "conan-1.54.0-linux-el6-i686"
+ "python-3.6.13-linux-el7-x86_64" -> "conan-1.54.0-linux-el7-x86_64"
+ "python-3.6.13-linux-el7-i686" -> "conan-1.54.0-linux-el7-i686"
- "dev-el6-gcc44" -> "conan-1.53.0-linux-el6-x86_64"
- "dev-el6-gcc44-x86" -> "conan-1.53.0-linux-el6-i686"
- "dev-el7-gcc48" -> "conan-1.53.0-linux-el7-x86_64"
- "dev-el7-gcc48-x86" -> "conan-1.53.0-linux-el7-i686"
+ "dev-el6-gcc44" -> "conan-1.54.0-linux-el6-x86_64"
+ "dev-el6-gcc44-x86" -> "conan-1.54.0-linux-el6-i686"
+ "dev-el7-gcc48" -> "conan-1.54.0-linux-el7-x86_64"
+ "dev-el7-gcc48-x86" -> "conan-1.54.0-linux-el7-i686"
"python-3.6.13-linux-el6-x86_64" -> "conan-el6-gcc44"
"python-3.6.13-linux-el6-x86_64" -> "conan-el6-gcc73"
@@ -185,24 +185,24 @@ digraph CentOS_conan {
"cmake-3.24.2-linux-el7-i686" -> "conan-el7-gcc82-x86"
"cmake-3.24.2-linux-el7-i686" -> "conan-el7-gcc93-x86"
- "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc44"
- "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc73"
- "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc83"
- "conan-1.53.0-linux-el6-x86_64" -> "conan-el6-gcc91"
-
- "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc44-x86"
- "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc73-x86"
- "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc83-x86"
- "conan-1.53.0-linux-el6-i686" -> "conan-el6-gcc91-x86"
-
- "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc48"
- "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc73"
- "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc83"
- "conan-1.53.0-linux-el7-x86_64" -> "conan-el7-gcc93"
-
- "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc48-x86"
- "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc73-x86"
- "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc82-x86"
- "conan-1.53.0-linux-el7-i686" -> "conan-el7-gcc93-x86"
+ "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc44"
+ "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc73"
+ "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc83"
+ "conan-1.54.0-linux-el6-x86_64" -> "conan-el6-gcc91"
+
+ "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc44-x86"
+ "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc73-x86"
+ "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc83-x86"
+ "conan-1.54.0-linux-el6-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc48"
+ "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc73"
+ "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc83"
+ "conan-1.54.0-linux-el7-x86_64" -> "conan-el7-gcc93"
+
+ "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc48-x86"
+ "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc73-x86"
+ "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc82-x86"
+ "conan-1.54.0-linux-el7-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab