From fa72c98ddf067f62df6f8a0b3eb65367adb266e0 Mon Sep 17 00:00:00 2001
From: Patrick Madela <patrick.madela@synchrotron-soleil.fr>
Date: Sun, 9 Feb 2025 17:10:00 +0100
Subject: [PATCH] Remove platforms with useless compilers gcc 7 and gcc 8

---
 .gitlab-ci.yml                         | 48 -------------------
 conan-el6-gcc73-x86/.gitlab-ci.yml     | 42 -----------------
 conan-el6-gcc73-x86/Dockerfile         | 64 --------------------------
 conan-el6-gcc73-x86/docker-compose.yml | 18 --------
 conan-el6-gcc73/.gitlab-ci.yml         | 42 -----------------
 conan-el6-gcc73/Dockerfile             | 60 ------------------------
 conan-el6-gcc73/docker-compose.yml     | 18 --------
 conan-el6-gcc83-x86/.gitlab-ci.yml     | 42 -----------------
 conan-el6-gcc83-x86/Dockerfile         | 64 --------------------------
 conan-el6-gcc83-x86/docker-compose.yml | 19 --------
 conan-el6-gcc83/.gitlab-ci.yml         | 42 -----------------
 conan-el6-gcc83/Dockerfile             | 60 ------------------------
 conan-el6-gcc83/docker-compose.yml     | 18 --------
 conan-el7-gcc73-x86/.gitlab-ci.yml     | 42 -----------------
 conan-el7-gcc73-x86/Dockerfile         | 64 --------------------------
 conan-el7-gcc73-x86/docker-compose.yml | 19 --------
 conan-el7-gcc73/.gitlab-ci.yml         | 42 -----------------
 conan-el7-gcc73/Dockerfile             | 63 -------------------------
 conan-el7-gcc73/docker-compose.yml     | 18 --------
 conan-el7-gcc82-x86/.gitlab-ci.yml     | 42 -----------------
 conan-el7-gcc82-x86/Dockerfile         | 64 --------------------------
 conan-el7-gcc82-x86/docker-compose.yml | 19 --------
 conan-el7-gcc83/.gitlab-ci.yml         | 42 -----------------
 conan-el7-gcc83/Dockerfile             | 63 -------------------------
 conan-el7-gcc83/docker-compose.yml     | 18 --------
 25 files changed, 1033 deletions(-)
 delete mode 100644 conan-el6-gcc73-x86/.gitlab-ci.yml
 delete mode 100755 conan-el6-gcc73-x86/Dockerfile
 delete mode 100644 conan-el6-gcc73-x86/docker-compose.yml
 delete mode 100644 conan-el6-gcc73/.gitlab-ci.yml
 delete mode 100755 conan-el6-gcc73/Dockerfile
 delete mode 100644 conan-el6-gcc73/docker-compose.yml
 delete mode 100644 conan-el6-gcc83-x86/.gitlab-ci.yml
 delete mode 100755 conan-el6-gcc83-x86/Dockerfile
 delete mode 100644 conan-el6-gcc83-x86/docker-compose.yml
 delete mode 100644 conan-el6-gcc83/.gitlab-ci.yml
 delete mode 100755 conan-el6-gcc83/Dockerfile
 delete mode 100644 conan-el6-gcc83/docker-compose.yml
 delete mode 100644 conan-el7-gcc73-x86/.gitlab-ci.yml
 delete mode 100755 conan-el7-gcc73-x86/Dockerfile
 delete mode 100644 conan-el7-gcc73-x86/docker-compose.yml
 delete mode 100644 conan-el7-gcc73/.gitlab-ci.yml
 delete mode 100755 conan-el7-gcc73/Dockerfile
 delete mode 100644 conan-el7-gcc73/docker-compose.yml
 delete mode 100644 conan-el7-gcc82-x86/.gitlab-ci.yml
 delete mode 100755 conan-el7-gcc82-x86/Dockerfile
 delete mode 100644 conan-el7-gcc82-x86/docker-compose.yml
 delete mode 100644 conan-el7-gcc83/.gitlab-ci.yml
 delete mode 100755 conan-el7-gcc83/Dockerfile
 delete mode 100644 conan-el7-gcc83/docker-compose.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0be1bc..ba49dee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,18 +13,6 @@ conan-el6-gcc44:
     include: conan-el6-gcc44/.gitlab-ci.yml
     strategy: depend
 
-conan-el6-gcc73:
-    stage: triggers
-    trigger:
-        include: conan-el6-gcc73/.gitlab-ci.yml
-        strategy: depend
-
-conan-el6-gcc83:
-    stage: triggers
-    trigger:
-        include: conan-el6-gcc83/.gitlab-ci.yml
-        strategy: depend
-
 conan-el6-gcc91:
     stage: triggers
     trigger:
@@ -37,18 +25,6 @@ conan-el6-gcc44-x86:
     include: conan-el6-gcc44-x86/.gitlab-ci.yml
     strategy: depend
 
-conan-el6-gcc73-x86:
-    stage: triggers
-    trigger:
-      include: conan-el6-gcc73-x86/.gitlab-ci.yml
-      strategy: depend
-
-conan-el6-gcc83-x86:
-    stage: triggers
-    trigger:
-      include: conan-el6-gcc83-x86/.gitlab-ci.yml
-      strategy: depend
-
 conan-el6-gcc91-x86:
     stage: triggers
     trigger:
@@ -61,18 +37,6 @@ conan-el7-gcc48:
     include: conan-el7-gcc48/.gitlab-ci.yml
     strategy: depend 
 
-conan-el7-gcc73:
-    stage: triggers
-    trigger:
-        include: conan-el7-gcc73/.gitlab-ci.yml
-        strategy: depend
-
-conan-el7-gcc83:
-    stage: triggers
-    trigger:
-        include: conan-el7-gcc83/.gitlab-ci.yml
-        strategy: depend
-
 conan-el7-gcc93:
     stage: triggers
     trigger:
@@ -85,18 +49,6 @@ conan-el7-gcc48-x86:
     include: conan-el7-gcc48-x86/.gitlab-ci.yml
     strategy: depend
 
-conan-el7-gcc73-x86:
-    stage: triggers
-    trigger:
-      include: conan-el7-gcc73-x86/.gitlab-ci.yml
-      strategy: depend
-
-conan-el7-gcc82-x86:
-    stage: triggers
-    trigger:
-      include: conan-el7-gcc82-x86/.gitlab-ci.yml
-      strategy: depend
-
 conan-el7-gcc93-x86:
     stage: triggers
     trigger:
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
deleted file mode 100644
index 5f959d0..0000000
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el6-gcc73-x86
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
deleted file mode 100755
index c25f54d..0000000
--- a/conan-el6-gcc73-x86/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=i686
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
-
-RUN groupadd 1001 -g 1001 \
-    && groupadd 1000 -g 1000 \
-    && groupadd 2000 -g 2000 \
-    && groupadd 999 -g 999 \
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-i686 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
-    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
-    && rm /bin/sh \
-    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \
-    && chmod +x /bin/sh
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-7 && linux32 -- \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el6-gcc73-x86/docker-compose.yml b/conan-el6-gcc73-x86/docker-compose.yml
deleted file mode 100644
index e94d692..0000000
--- a/conan-el6-gcc73-x86/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el6-gcc73-x86:
-        build:
-            context: ..
-            dockerfile: conan-el6-gcc73-x86/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73-x86"
-        container_name: conan-el6-gcc73-x86
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
deleted file mode 100644
index 087b925..0000000
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el6-gcc73
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
deleted file mode 100755
index d09bee0..0000000
--- a/conan-el6-gcc73/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=x86_64
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
-
-RUN groupadd 1001 -g 1001 \
-    && groupadd 1000 -g 1000 \
-    && groupadd 2000 -g 2000 \
-    && groupadd 999 -g 999 \
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-x86_64 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/*
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-7 && \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el6-gcc73/docker-compose.yml b/conan-el6-gcc73/docker-compose.yml
deleted file mode 100644
index 102a0f9..0000000
--- a/conan-el6-gcc73/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el6-gcc73:
-        build:
-            context: ..
-            dockerfile: conan-el6-gcc73/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73"
-        container_name: conan-el6-gcc73
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
deleted file mode 100644
index c6546f1..0000000
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el6-gcc83-x86
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
deleted file mode 100755
index 495b45d..0000000
--- a/conan-el6-gcc83-x86/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc83-x86
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=i686
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
-
-RUN groupadd 1001 -g 1001 \
-    && groupadd 1000 -g 1000 \
-    && groupadd 2000 -g 2000 \
-    && groupadd 999 -g 999 \
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-i686 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
-    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
-    && rm /bin/sh \
-    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \
-    && chmod +x /bin/sh
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-8 && linux32 -- \"$@\"", "-s"]
-
-CMD ["bash"]
\ No newline at end of file
diff --git a/conan-el6-gcc83-x86/docker-compose.yml b/conan-el6-gcc83-x86/docker-compose.yml
deleted file mode 100644
index 758c04b..0000000
--- a/conan-el6-gcc83-x86/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el6-gcc83-x86:
-        build:
-            context: ..
-            dockerfile: conan-el6-gcc83-x86/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83-x86"
-        container_name: conan-el6-gcc83-x86
-        platform: "linux/386"
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
deleted file mode 100644
index 48009e6..0000000
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el6-gcc83
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
deleted file mode 100755
index a90bd3b..0000000
--- a/conan-el6-gcc83/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc83
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=x86_64
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
-
-RUN groupadd 1001 -g 1001 \
-    && groupadd 1000 -g 1000 \
-    && groupadd 2000 -g 2000 \
-    && groupadd 999 -g 999 \
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-x86_64 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-x86_64 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/*
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-8 && \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el6-gcc83/docker-compose.yml b/conan-el6-gcc83/docker-compose.yml
deleted file mode 100644
index e0a6e4c..0000000
--- a/conan-el6-gcc83/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el6-gcc83:
-        build:
-            context: ..
-            dockerfile: conan-el6-gcc83/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83"
-        container_name: conan-el6-gcc83
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
deleted file mode 100644
index 7e8ac51..0000000
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el7-gcc73-x86
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
deleted file mode 100755
index d483c90..0000000
--- a/conan-el7-gcc73-x86/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73-x86
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=i686
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
-
-RUN groupadd g1001 -g 1001 \
-    && groupadd g1000 -g 1000 \
-    && groupadd g2000 -g 2000 \
-    # Creation of conan user
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-i686 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
-    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
-    && rm /bin/sh \
-    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \
-    && chmod +x /bin/sh
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-7 && linux32 -- \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el7-gcc73-x86/docker-compose.yml b/conan-el7-gcc73-x86/docker-compose.yml
deleted file mode 100644
index 7c68d26..0000000
--- a/conan-el7-gcc73-x86/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el7-gcc73-x86:
-        build:
-            context: ..
-            dockerfile: conan-el7-gcc73-x86/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73-x86"
-        container_name: conan-el7-gcc73-x86
-        platform: "linux/386"
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
deleted file mode 100644
index 435dd49..0000000
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el7-gcc73
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
deleted file mode 100755
index cb3c757..0000000
--- a/conan-el7-gcc73/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=x86_64
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
-
-RUN groupadd g1001 -g 1001 \
-    && groupadd g1000 -g 1000 \
-    && groupadd g2000 -g 2000 \
-    # Creation of conan user
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-x86_64 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/*
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-7 && \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el7-gcc73/docker-compose.yml b/conan-el7-gcc73/docker-compose.yml
deleted file mode 100644
index d662cbd..0000000
--- a/conan-el7-gcc73/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el7-gcc73:
-        build:
-            context: ..
-            dockerfile: conan-el7-gcc73/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73"
-        container_name: conan-el7-gcc73
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
deleted file mode 100644
index 2242ba6..0000000
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el7-gcc82-x86
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
deleted file mode 100755
index 2654c43..0000000
--- a/conan-el7-gcc82-x86/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc82-x86
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=i686
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
-
-RUN groupadd g1001 -g 1001 \
-    && groupadd g1000 -g 1000 \
-    && groupadd g2000 -g 2000 \
-    # Creation of conan user
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-i686 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.30.2/download?job=linux-i686 \
-    && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CMAKE_ROOT}.zip \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
-    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
-    && rm /bin/sh \
-    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \
-    && chmod +x /bin/sh
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-8 && linux32 -- \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el7-gcc82-x86/docker-compose.yml b/conan-el7-gcc82-x86/docker-compose.yml
deleted file mode 100644
index 94e274d..0000000
--- a/conan-el7-gcc82-x86/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el7-gcc82-x86:
-        build:
-            context: ..
-            dockerfile: conan-el7-gcc82-x86/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86"
-        container_name: conan-el7-gcc82-x86
-        platform: "linux/386"
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
deleted file mode 100644
index 952253b..0000000
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-variables:
-    NAME: conan-el7-gcc83
-    CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
-    CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
-
-stages:
-    - build
-    - test
-    - release
-
-before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
-
-build:
-    stage: build
-    script:
-        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
-        - docker push ${CONTAINER_TEST_IMAGE}
-
-test:
-    stage: test
-    script:
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.30.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.6.0"
-        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
-        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
-
-release:
-    stage: release
-    script:
-        - docker pull ${CONTAINER_TEST_IMAGE}
-        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
-        - docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
deleted file mode 100755
index 281cfa9..0000000
--- a/conan-el7-gcc83/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc83
-
-LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
-
-ARG PYTHON_VERSION=3.6.13 \
-    CONAN_VERSION=2.6.0 \
-    CMAKE_VERSION=3.30.2 \
-    GIT_VERSION=2.39.2 \
-    DEVTOOLS_ROOT=/usr/Local/devtools \
-    OS=linux \
-    ARCH=x86_64
-
-ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
-    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
-    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
-    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
-    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
-    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
-    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
-
-RUN groupadd g1001 -g 1001 \
-    && groupadd g1000 -g 1000 \
-    && groupadd g2000 -g 2000 \
-    # Creation of conan user
-    && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \
-    # Add sudo for conan user
-    && printf "conan:conan" | chpasswd \
-    && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \
-    # Create devtools folder
-    && mkdir -p ${DEVTOOLS_ROOT} \
-    # Install python 3
-    && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-x86_64 \
-    && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${PYTHON_ROOT}.zip \
-    # Install git
-    && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \
-    && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${GIT_ROOT}.zip \
-    # Install cmake
-    && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ 
-    && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \
-        --exclude=bin/cmake-gui \
-        --exclude=doc/cmake \
-        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
-        --exclude=share/vim \
-    # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-x86_64 \
-    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip \
-    # Install other tools
-    && mkdir ${DEVTOOLS_ROOT}/bin \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
-    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
-    && chmod +x ${DEVTOOLS_ROOT}/bin/*
-
-COPY environment /etc/environment 
-USER conan
-WORKDIR /home/conan
-
-ENTRYPOINT ["bash", "-c" ,"source scl_source enable devtoolset-8 && \"$@\"", "-s"]
-
-CMD ["bash"]
diff --git a/conan-el7-gcc83/docker-compose.yml b/conan-el7-gcc83/docker-compose.yml
deleted file mode 100644
index 5975d0e..0000000
--- a/conan-el7-gcc83/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.8"
-
-services:
-    conan-el7-gcc83:
-        build:
-            context: ..
-            dockerfile: conan-el7-gcc83/Dockerfile
-            args:
-              - http_proxy
-              - https_proxy
-              - no_proxy
-        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83"
-        container_name: conan-el7-gcc83
-        tty: true
-        environment:
-            - http_proxy
-            - https_proxy
-            - no_proxy
-- 
GitLab