From ae057593bc2a02ebba8ec8ceabe9626c1f3f2384 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 20 Jan 2023 11:29:35 +0100
Subject: [PATCH] Update to Conan 1.57.0 and Git 2.39.1
---
README.md | 6 +--
conan-el6-gcc44-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc44-x86/Dockerfile | 6 +--
conan-el6-gcc44-x86/README.md | 84 -----------------------------
conan-el6-gcc44/.gitlab-ci.yml | 4 +-
conan-el6-gcc44/Dockerfile | 6 +--
conan-el6-gcc44/README.md | 84 -----------------------------
conan-el6-gcc73-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc73-x86/Dockerfile | 6 +--
conan-el6-gcc73-x86/README.md | 84 -----------------------------
conan-el6-gcc73/.gitlab-ci.yml | 4 +-
conan-el6-gcc73/Dockerfile | 6 +--
conan-el6-gcc73/README.md | 84 -----------------------------
conan-el6-gcc83-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc83-x86/Dockerfile | 6 +--
conan-el6-gcc83-x86/README.md | 84 -----------------------------
conan-el6-gcc83/.gitlab-ci.yml | 4 +-
conan-el6-gcc83/Dockerfile | 6 +--
conan-el6-gcc83/README.md | 84 -----------------------------
conan-el6-gcc91-x86/.gitlab-ci.yml | 4 +-
conan-el6-gcc91-x86/Dockerfile | 6 +--
conan-el6-gcc91-x86/README.md | 84 -----------------------------
conan-el6-gcc91/.gitlab-ci.yml | 4 +-
conan-el6-gcc91/Dockerfile | 6 +--
conan-el6-gcc91/README.md | 84 -----------------------------
conan-el7-gcc48-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc48-x86/Dockerfile | 6 +--
conan-el7-gcc48-x86/README.md | 65 ----------------------
conan-el7-gcc48/.gitlab-ci.yml | 4 +-
conan-el7-gcc48/Dockerfile | 6 +--
conan-el7-gcc48/README.md | 65 ----------------------
conan-el7-gcc73-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc73-x86/Dockerfile | 6 +--
conan-el7-gcc73-x86/README.md | 65 ----------------------
conan-el7-gcc73/.gitlab-ci.yml | 4 +-
conan-el7-gcc73/Dockerfile | 6 +--
conan-el7-gcc73/README.md | 65 ----------------------
conan-el7-gcc82-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc82-x86/Dockerfile | 6 +--
conan-el7-gcc82-x86/README.md | 65 ----------------------
conan-el7-gcc83/.gitlab-ci.yml | 4 +-
conan-el7-gcc83/Dockerfile | 6 +--
conan-el7-gcc83/README.md | 65 ----------------------
conan-el7-gcc93-x86/.gitlab-ci.yml | 4 +-
conan-el7-gcc93-x86/Dockerfile | 6 +--
conan-el7-gcc93-x86/README.md | 65 ----------------------
conan-el7-gcc93/.gitlab-ci.yml | 4 +-
conan-el7-gcc93/Dockerfile | 6 +--
conan-el7-gcc93/README.md | 65 ----------------------
dependencies.dot | 86 +++++++++++++++---------------
50 files changed, 126 insertions(+), 1318 deletions(-)
delete mode 100644 conan-el6-gcc44-x86/README.md
delete mode 100644 conan-el6-gcc44/README.md
delete mode 100644 conan-el6-gcc73-x86/README.md
delete mode 100644 conan-el6-gcc73/README.md
delete mode 100644 conan-el6-gcc83-x86/README.md
delete mode 100644 conan-el6-gcc83/README.md
delete mode 100644 conan-el6-gcc91-x86/README.md
delete mode 100644 conan-el6-gcc91/README.md
delete mode 100644 conan-el7-gcc48-x86/README.md
delete mode 100644 conan-el7-gcc48/README.md
delete mode 100644 conan-el7-gcc73-x86/README.md
delete mode 100644 conan-el7-gcc73/README.md
delete mode 100644 conan-el7-gcc82-x86/README.md
delete mode 100644 conan-el7-gcc83/README.md
delete mode 100644 conan-el7-gcc93-x86/README.md
delete mode 100644 conan-el7-gcc93/README.md
diff --git a/README.md b/README.md
index a35363e..cb38336 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 1.55.0 with Python 3.6.13
+- Conan 1.57.0 with Python 3.6.13
- Cmake 3.25.1
-- Git 2.38.1
+- Git 2.39.1
| 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=1.55.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.57.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 a9c1084..c9496ad 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -29,9 +29,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index f9d9825..9de6132 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el6-gcc44-x86/README.md b/conan-el6-gcc44-x86/README.md
deleted file mode 100644
index 6a01250..0000000
--- a/conan-el6-gcc44-x86/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc44-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc44-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc44-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc44-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index d3b642d..3db76c0 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -29,9 +29,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index f23c670..5c9cc4a 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/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)
diff --git a/conan-el6-gcc44/README.md b/conan-el6-gcc44/README.md
deleted file mode 100644
index 78e3fe0..0000000
--- a/conan-el6-gcc44/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc44
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc44
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc44
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc44 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index 489a67e..67999da 100644
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 062c2be..3835c14 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el6-gcc73-x86/README.md b/conan-el6-gcc73-x86/README.md
deleted file mode 100644
index 50d898b..0000000
--- a/conan-el6-gcc73-x86/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc73-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc73-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc73-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc73-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index 5a09371..a79b988 100644
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 601a189..caa3a6f 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/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)
diff --git a/conan-el6-gcc73/README.md b/conan-el6-gcc73/README.md
deleted file mode 100644
index 0c12034..0000000
--- a/conan-el6-gcc73/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc73
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc73
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc73
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc73 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index 7b48d09..ffde067 100644
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index f23d1ee..8e03ddb 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el6-gcc83-x86/README.md b/conan-el6-gcc83-x86/README.md
deleted file mode 100644
index b988b5b..0000000
--- a/conan-el6-gcc83-x86/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc83-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc83-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc83-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc83-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index ce0942c..6ba9454 100644
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index 1c90ab9..1671ad6 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/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)
diff --git a/conan-el6-gcc83/README.md b/conan-el6-gcc83/README.md
deleted file mode 100644
index 072c1ae..0000000
--- a/conan-el6-gcc83/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc83
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc83
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc83
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc83 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index e79d00b..f6005ed 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index 94a6c19..e496ad9 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el6-gcc91-x86/README.md b/conan-el6-gcc91-x86/README.md
deleted file mode 100644
index 8b79a12..0000000
--- a/conan-el6-gcc91-x86/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc91-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc91-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc91-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc91-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index ec6eada..70fd6ba 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 50f37a0..7472322 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/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)
diff --git a/conan-el6-gcc91/README.md b/conan-el6-gcc91/README.md
deleted file mode 100644
index 7536291..0000000
--- a/conan-el6-gcc91/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el6-gcc91
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el6-gcc91
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el6-gcc91
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el6-gcc91 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
-
-### CentOS 6 on WSL2
-There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2
-
-The exit with return code 139
-https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344
-
-Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF)
-```
-[wsl2]
-kernelCommandLine = vsyscall=emulate
-```
-
-For testing
-
-```
-$ docker run -ti centos:6 bash
-```
-
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index cf7f3cd..2b38c5f 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -29,9 +29,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 5b1f12e..263d052 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc48-x86/README.md b/conan-el7-gcc48-x86/README.md
deleted file mode 100644
index d9e14c0..0000000
--- a/conan-el7-gcc48-x86/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc48-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc48-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc48-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc48-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index 53fac10..8f0db5a 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -29,9 +29,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index ff074d0..4d281e8 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc48/README.md b/conan-el7-gcc48/README.md
deleted file mode 100644
index 5ddcd57..0000000
--- a/conan-el7-gcc48/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc48
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc48
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc48
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc48 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index baa9413..31d7848 100644
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc73-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 9f380a4..994dcb7 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc73-x86/README.md b/conan-el7-gcc73-x86/README.md
deleted file mode 100644
index 489d39f..0000000
--- a/conan-el7-gcc73-x86/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc73-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc73-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc73-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc73-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index b688121..58ca1a0 100644
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ b/conan-el7-gcc73/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index 7241993..f3c3ecd 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc73/README.md b/conan-el7-gcc73/README.md
deleted file mode 100644
index acf01a0..0000000
--- a/conan-el7-gcc73/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc73
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc73
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc73
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc73 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index 250965b..a20f7e4 100644
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc82-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index b0adcd1..2cfd38a 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc82-x86/README.md b/conan-el7-gcc82-x86/README.md
deleted file mode 100644
index 3d50db8..0000000
--- a/conan-el7-gcc82-x86/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc82-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc82-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc82-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc82-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index 8252e55..7aba10c 100644
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ b/conan-el7-gcc83/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index f1c3430..1653437 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc83/README.md b/conan-el7-gcc83/README.md
deleted file mode 100644
index 4400e02..0000000
--- a/conan-el7-gcc83/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc83
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc83
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc83
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc83 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index 5d012a4..042a55e 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- 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.55.0"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 58c5c5e..46072fd 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
DEVTOOLS_ROOT=/usr/Local/devtools \
OS=linux \
ARCH=i686
@@ -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.38.1/download?job=linux-i686 \
+ && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc93-x86/README.md b/conan-el7-gcc93-x86/README.md
deleted file mode 100644
index c3e7e15..0000000
--- a/conan-el7-gcc93-x86/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc93-x86
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93-x86 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc93-x86
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93-x86
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc93-x86
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc93-x86 linux32 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 013ddba..900e6d9 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -28,9 +28,9 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
- docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3"
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
- - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0"
release:
stage: release
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 67a1af4..2f698b5 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=1.55.0 \
+ CONAN_VERSION=1.57.0 \
CMAKE_VERSION=3.25.1 \
- GIT_VERSION=2.38.1 \
+ GIT_VERSION=2.39.1 \
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.38.1/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.39.1/download?job=linux-x86_64 \
&& unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${GIT_ROOT}.zip \
# Install cmake
diff --git a/conan-el7-gcc93/README.md b/conan-el7-gcc93/README.md
deleted file mode 100644
index 8bc0298..0000000
--- a/conan-el7-gcc93/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Conan docker tools for Soleil
-
-Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments
-
-Image includes:
-- Python 3.6.13
-- Conan 1.55.0
-- Cmake 3.25.1
-- Git 2.38.1
-
-## Build
-
-### To build image with docker-compose
-
-```
-docker-compose build conan-el7-gcc93
-```
-
-### To build image without docker-compose
-
-```
-docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93 .
-```
-
-## Launch
-
-### To launch with docker-compose
-```
-$ docker-compose run --rm conan-el7-gcc93
-```
-
-### To launch without docker-compose
-
-```
-$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93
-```
-
-### To launch containers in detached mode with docker-compose
-
-To launch the containers
-```
-$ docker-compose up -d conan-el7-gcc93
-```
-
-To connect into the container
-```
-$ docker exec -it conan-el7-gcc93 bash
-```
-
-## Known issues
-
-### BuildKit
-When you build an image that depends of other, you can be unable to get dependency if buildKit is enable
-```
- => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest 1.5s
-------
- > [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest:
-------
-failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
-```
-
-To fix it
-```
-export DOCKER_BUILDKIT=0
-```
diff --git a/dependencies.dot b/dependencies.dot
index 5f01cf3..9726080 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.38.1-linux-x86_64"
- "git-2.38.1-linux-i686"
+ "git-2.39.1-linux-x86_64"
+ "git-2.39.1-linux-i686"
"cmake-3.25.1-linux-i686"
- "conan-1.55.0-linux-x86_64"
- "conan-1.55.0-linux-i686"
+ "conan-1.57.0-linux-x86_64"
+ "conan-1.57.0-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,8 +123,8 @@ digraph CentOS_conan {
# Use
edge [dir=back arrowtail=vee]
- "conan-el6-gcc91" -> "git-2.38.1-linux-x86_64"
- "conan-el6-gcc91-x86" -> "git-2.38.1-linux-i686"
+ "conan-el6-gcc91" -> "git-2.39.1-linux-x86_64"
+ "conan-el6-gcc91-x86" -> "git-2.39.1-linux-i686"
"conan-el6-gcc91" -> "python-3.6.13-linux-x86_64"
"conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686"
@@ -132,8 +132,8 @@ digraph CentOS_conan {
"dev-el6-gcc73-x86" -> "cmake-3.25.1-linux-i686"
"dev-el7-gcc73-x86" -> "cmake-3.25.1-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-1.55.0-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-1.55.0-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-1.57.0-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-1.57.0-linux-i686"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc44"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc73"
@@ -155,25 +155,25 @@ 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.38.1-linux-x86_64" -> "conan-el6-gcc44"
- "git-2.38.1-linux-x86_64" -> "conan-el6-gcc73"
- "git-2.38.1-linux-x86_64" -> "conan-el6-gcc83"
- "git-2.38.1-linux-x86_64" -> "conan-el6-gcc91"
+ "git-2.39.1-linux-x86_64" -> "conan-el6-gcc44"
+ "git-2.39.1-linux-x86_64" -> "conan-el6-gcc73"
+ "git-2.39.1-linux-x86_64" -> "conan-el6-gcc83"
+ "git-2.39.1-linux-x86_64" -> "conan-el6-gcc91"
- "git-2.38.1-linux-i686" -> "conan-el6-gcc44-x86"
- "git-2.38.1-linux-i686" -> "conan-el6-gcc73-x86"
- "git-2.38.1-linux-i686" -> "conan-el6-gcc83-x86"
- "git-2.38.1-linux-i686" -> "conan-el6-gcc91-x86"
+ "git-2.39.1-linux-i686" -> "conan-el6-gcc44-x86"
+ "git-2.39.1-linux-i686" -> "conan-el6-gcc73-x86"
+ "git-2.39.1-linux-i686" -> "conan-el6-gcc83-x86"
+ "git-2.39.1-linux-i686" -> "conan-el6-gcc91-x86"
- "git-2.38.1-linux-x86_64" -> "conan-el7-gcc48"
- "git-2.38.1-linux-x86_64" -> "conan-el7-gcc73"
- "git-2.38.1-linux-x86_64" -> "conan-el7-gcc83"
- "git-2.38.1-linux-x86_64" -> "conan-el7-gcc93"
+ "git-2.39.1-linux-x86_64" -> "conan-el7-gcc48"
+ "git-2.39.1-linux-x86_64" -> "conan-el7-gcc73"
+ "git-2.39.1-linux-x86_64" -> "conan-el7-gcc83"
+ "git-2.39.1-linux-x86_64" -> "conan-el7-gcc93"
- "git-2.38.1-linux-i686" -> "conan-el7-gcc48-x86"
- "git-2.38.1-linux-i686" -> "conan-el7-gcc73-x86"
- "git-2.38.1-linux-i686" -> "conan-el7-gcc82-x86"
- "git-2.38.1-linux-i686" -> "conan-el7-gcc93-x86"
+ "git-2.39.1-linux-i686" -> "conan-el7-gcc48-x86"
+ "git-2.39.1-linux-i686" -> "conan-el7-gcc73-x86"
+ "git-2.39.1-linux-i686" -> "conan-el7-gcc82-x86"
+ "git-2.39.1-linux-i686" -> "conan-el7-gcc93-x86"
"cmake-3.25.1-linux-i686" -> "conan-el6-gcc44-x86"
"cmake-3.25.1-linux-i686" -> "conan-el6-gcc73-x86"
@@ -185,23 +185,23 @@ digraph CentOS_conan {
"cmake-3.25.1-linux-i686" -> "conan-el7-gcc82-x86"
"cmake-3.25.1-linux-i686" -> "conan-el7-gcc93-x86"
- "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc44"
- "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc73"
- "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc83"
- "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-1.55.0-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-1.55.0-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-1.55.0-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-1.55.0-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc48"
- "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc73"
- "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc83"
- "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-1.55.0-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-1.55.0-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-1.55.0-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-1.55.0-linux-i686" -> "conan-el7-gcc93-x86"
+ "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-1.57.0-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-1.57.0-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-1.57.0-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab