From d5f1706f91b12b7efe1dbfe2645e3c7296bf630f Mon Sep 17 00:00:00 2001
From: Patrick Madela <patrick.madela@synchrotron-soleil.fr>
Date: Sun, 9 Feb 2025 17:20:08 +0100
Subject: [PATCH] Remove platforms with useless compilers gcc 7 and gcc 8
---
README.md | 18 +++-----
dependencies.dot | 115 ++++++++++-------------------------------------
2 files changed, 28 insertions(+), 105 deletions(-)
diff --git a/README.md b/README.md
index f9b2cc3..dbf208f 100644
--- a/README.md
+++ b/README.md
@@ -3,26 +3,18 @@
Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
All images include:
-- Conan 2.6.0 with Python 3.6.13
-- Cmake 3.30.2
+- Conan 2.12.1 with Python 3.6.13
+- Cmake 3.31.5
- Git 2.39.2
| Image | OS | Arch | GCC |
| ------------------- | -------------- | ------- | --------------------------------------------|
| conan-el6-gcc44 | CentOS 6 | x86_64 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) |
| conan-el6-gcc44-x86 | CentOS 6 | i686 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) |
-| conan-el6-gcc73 | CentOS 6 | x86_64 | gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) |
-| conan-el6-gcc73-x86 | CentOS 6 | i686 | gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) |
-| conan-el6-gcc83 | CentOS 6 | x86_64 | gcc (GCC) 8.3.1 20190311 (Red Hat 8.3.1-3) |
-| conan-el6-gcc83-x86 | CentOS 6 | i686 | gcc (GCC) 8.3.1 20190311 (Red Hat 8.3.1-3) |
| conan-el6-gcc91 | CentOS 6 | x86_64 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) |
| conan-el6-gcc91-x86 | CentOS 6 | i686 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) |
-| conan-el7-gcc44 | CentOS 7 | x86_64 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) |
-| conan-el7-gcc44-x86 | CentOS 7 | i686 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) |
-| conan-el7-gcc73 | CentOS 7 | x86_64 | gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) |
-| conan-el7-gcc73-x86 | CentOS 7 | i686 | gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) |
-| conan-el7-gcc83 | CentOS 7 | x86_64 | gcc (GCC) 8.3.1 20190311 (Red Hat 8.3.1-3) |
-| conan-el7-gcc82-x86 | CentOS 7 | i686 | gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3) |
+| conan-el7-gcc48 | CentOS 7 | x86_64 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) |
+| conan-el7-gcc48-x86 | CentOS 7 | i686 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) |
| conan-el7-gcc93 | CentOS 7 | x86_64 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) |
| conan-el7-gcc93-x86 | CentOS 7 | i686 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) |
@@ -43,7 +35,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.6.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=2.12.1 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
```
## Launch
diff --git a/dependencies.dot b/dependencies.dot
index 8d6fdc3..21b5996 100644
--- a/dependencies.dot
+++ b/dependencies.dot
@@ -14,43 +14,27 @@ digraph CentOS_conan {
ranksep=2;
"dev-el6-gcc44"
- "dev-el6-gcc73"
- "dev-el6-gcc83"
"dev-el6-gcc91"
"dev-el6-gcc44-x86"
- "dev-el6-gcc73-x86"
- "dev-el6-gcc83-x86"
"dev-el6-gcc91-x86"
"dev-el7-gcc48"
- "dev-el7-gcc73"
- "dev-el7-gcc83"
"dev-el7-gcc93"
"dev-el7-gcc48-x86"
- "dev-el7-gcc73-x86"
- "dev-el7-gcc82-x86"
"dev-el7-gcc93-x86"
"conan-el6-gcc44"
- "conan-el6-gcc73"
- "conan-el6-gcc83"
"conan-el6-gcc91"
"conan-el6-gcc44-x86"
- "conan-el6-gcc73-x86"
- "conan-el6-gcc83-x86"
"conan-el6-gcc91-x86"
"conan-el7-gcc48"
- "conan-el7-gcc73"
- "conan-el7-gcc83"
"conan-el7-gcc93"
"conan-el7-gcc48-x86"
- "conan-el7-gcc73-x86"
- "conan-el7-gcc82-x86"
"conan-el7-gcc93-x86"
node [shape=component, fillcolor= lightgray]
@@ -60,65 +44,43 @@ digraph CentOS_conan {
"git-2.39.2-linux-x86_64"
"git-2.39.2-linux-i686"
- "cmake-3.30.2-linux-i686"
+ "cmake-3.31.5-linux-i686"
- "conan-2.6.0-linux-x86_64"
- "conan-2.6.0-linux-i686"
+ "conan-2.12.1-linux-x86_64"
+ "conan-2.12.1-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"}
+ {rank = same; "dev-el6-gcc91"; "dev-el6-gcc91-x86"; "dev-el7-gcc93"; "dev-el7-gcc93-x86"}
"dev-el6-gcc44-x86"
- "dev-el6-gcc73-x86"
- "dev-el6-gcc83-x86"
"dev-el6-gcc91-x86"
"dev-el7-gcc48"
- "dev-el7-gcc73"
- "dev-el7-gcc83"
"dev-el7-gcc93"
"dev-el7-gcc48-x86"
- "dev-el7-gcc73-x86"
- "dev-el7-gcc82-x86"
"dev-el7-gcc93-x86"
# Extends
edge [dir=back arrowtail=empty]
- "dev-el6-gcc44" -> "dev-el6-gcc73"
- "dev-el6-gcc44" -> "dev-el6-gcc83"
"dev-el6-gcc44" -> "dev-el6-gcc91"
- "dev-el6-gcc44-x86" -> "dev-el6-gcc73-x86"
- "dev-el6-gcc44-x86" -> "dev-el6-gcc83-x86"
"dev-el6-gcc44-x86" -> "dev-el6-gcc91-x86"
- "dev-el7-gcc48" -> "dev-el7-gcc73"
- "dev-el7-gcc48" -> "dev-el7-gcc83"
"dev-el7-gcc48" -> "dev-el7-gcc93"
- "dev-el7-gcc48-x86" -> "dev-el7-gcc73-x86"
- "dev-el7-gcc48-x86" -> "dev-el7-gcc82-x86"
"dev-el7-gcc48-x86" -> "dev-el7-gcc93-x86"
"dev-el6-gcc44" -> "conan-el6-gcc44"
- "dev-el6-gcc73" -> "conan-el6-gcc73"
- "dev-el6-gcc83" -> "conan-el6-gcc83"
"dev-el6-gcc91" -> "conan-el6-gcc91"
"dev-el6-gcc44-x86" -> "conan-el6-gcc44-x86"
- "dev-el6-gcc73-x86" -> "conan-el6-gcc73-x86"
- "dev-el6-gcc83-x86" -> "conan-el6-gcc83-x86"
"dev-el6-gcc91-x86" -> "conan-el6-gcc91-x86"
"dev-el7-gcc48" -> "conan-el7-gcc48"
- "dev-el7-gcc73" -> "conan-el7-gcc73"
- "dev-el7-gcc83" -> "conan-el7-gcc83"
"dev-el7-gcc93" -> "conan-el7-gcc93"
"dev-el7-gcc48-x86" -> "conan-el7-gcc48-x86"
- "dev-el7-gcc73-x86" -> "conan-el7-gcc73-x86"
- "dev-el7-gcc82-x86" -> "conan-el7-gcc82-x86"
"dev-el7-gcc93-x86" -> "conan-el7-gcc93-x86"
# Use
@@ -129,79 +91,48 @@ 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.30.2-linux-i686"
- "dev-el7-gcc73-x86" -> "cmake-3.30.2-linux-i686"
-
- "python-3.6.13-linux-x86_64" -> "conan-2.6.0-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.6.0-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.12.1-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.12.1-linux-i686"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc44"
- "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73"
- "python-3.6.13-linux-x86_64" -> "conan-el6-gcc83"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc91"
"python-3.6.13-linux-i686" -> "conan-el6-gcc44-x86"
- "python-3.6.13-linux-i686" -> "conan-el6-gcc73-x86"
- "python-3.6.13-linux-i686" -> "conan-el6-gcc83-x86"
"python-3.6.13-linux-i686" -> "conan-el6-gcc91-x86"
"python-3.6.13-linux-x86_64" -> "conan-el7-gcc48"
- "python-3.6.13-linux-x86_64" -> "conan-el7-gcc73"
- "python-3.6.13-linux-x86_64" -> "conan-el7-gcc83"
"python-3.6.13-linux-x86_64" -> "conan-el7-gcc93"
"python-3.6.13-linux-i686" -> "conan-el7-gcc48-x86"
- "python-3.6.13-linux-i686" -> "conan-el7-gcc73-x86"
- "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.30.2-linux-i686" -> "conan-el6-gcc44-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el6-gcc73-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el6-gcc83-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el6-gcc91-x86"
-
- "cmake-3.30.2-linux-i686" -> "conan-el7-gcc48-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el7-gcc73-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el7-gcc82-x86"
- "cmake-3.30.2-linux-i686" -> "conan-el7-gcc93-x86"
-
- "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.6.0-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.6.0-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.6.0-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.6.0-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.6.0-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.6.0-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.6.0-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.6.0-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.6.0-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.6.0-linux-i686" -> "conan-el7-gcc93-x86"
+ "cmake-3.31.5-linux-i686" -> "conan-el6-gcc44-x86"
+ "cmake-3.31.5-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "cmake-3.31.5-linux-i686" -> "conan-el7-gcc48-x86"
+ "cmake-3.31.5-linux-i686" -> "conan-el7-gcc93-x86"
+
+ "conan-2.12.1-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.12.1-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.12.1-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.12.1-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.12.1-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.12.1-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.12.1-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.12.1-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab