Skip to content
Snippets Groups Projects
Commit a2635f5f authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Update to Conan 2.0.17 and Cmake 3.28.3

parent 73d16aa3
Branches
Tags
No related merge requests found
Pipeline #3153 failed
Pipeline: conan-docker-tools

#3169

    Pipeline: conan-docker-tools

    #3168

      Pipeline: conan-docker-tools

      #3167

        +13
        Showing
        with 55 additions and 55 deletions
        ......@@ -3,8 +3,8 @@
        Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
        All images include:
        - Conan 2.0.13 with Python 3.6.13
        - Cmake 3.27.7
        - Conan 2.0.17 with Python 3.6.13
        - Cmake 3.28.3
        - Git 2.39.2
        | Image | OS | Arch | GCC |
        ......@@ -43,7 +43,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
        ### To build image without docker-compose with specific version of Conan
        ```
        $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.13 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.17 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        ```
        ## Launch
        ......
        ......@@ -28,10 +28,10 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
        && 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.27.7/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -28,10 +28,10 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
        && 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.27.7/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
        && 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.27.7/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \
        && 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.27.7/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -27,10 +27,10 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-x86_64 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -28,10 +28,10 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        ......@@ -3,8 +3,8 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=2.0.13 \
        CMAKE_VERSION=3.27.7 \
        CONAN_VERSION=2.0.17 \
        CMAKE_VERSION=3.28.3 \
        GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ......@@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \
        && 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.27.7/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \
        # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686 \
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        ......@@ -28,10 +28,10 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.27.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3"
        - 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.0.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.17"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment