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

Update to Conan 2.0.8, Git 2.41.0 and Cmake 3.26.4

parent 3b9e52d0
Branches
Tags 2.0.8
No related merge requests found
Pipeline #2455 passed
Stage: triggers
Pipeline: conan-docker-tools

#2471

    Pipeline: conan-docker-tools

    #2470

      Pipeline: conan-docker-tools

      #2469

        +13
        Show whitespace changes
        Inline Side-by-side
        Showing
        with 84 additions and 84 deletions
        README.md
        + 4
        − 4
        View file @ a864a514
        ......@@ -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 2.0.7 with Python 3.6.13
        - Cmake 3.26.2
        - Git 2.39.2
        - Conan 2.0.8 with Python 3.6.13
        - Cmake 3.26.4
        - Git 2.41.0
        | 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=2.0.7 -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.8 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        ```
        ## Launch
        ......
        conan-el6-gcc44-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.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} cmake --version | grep "3.26.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - 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.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc44-x86/Dockerfile
        + 6
        − 6
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ARCH=i686
        ......@@ -34,15 +34,15 @@ 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.39.2/download?job=linux-i686 \
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/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.26.2/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc44/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc44/Dockerfile
        + 5
        − 5
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        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.39.2/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.41.0/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)
        ......@@ -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.7/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.8/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc73-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.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} cmake --version | grep "3.26.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - 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.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc73-x86/Dockerfile
        + 6
        − 6
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ARCH=i686
        ......@@ -34,15 +34,15 @@ 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.39.2/download?job=linux-i686 \
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/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.26.2/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc73/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc73/Dockerfile
        + 5
        − 5
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        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.39.2/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.41.0/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)
        ......@@ -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.7/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.8/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc83-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.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} cmake --version | grep "3.26.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - 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.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc83-x86/Dockerfile
        + 6
        − 6
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ARCH=i686
        ......@@ -34,15 +34,15 @@ 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.39.2/download?job=linux-i686 \
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/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.26.2/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc83/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc83/Dockerfile
        + 5
        − 5
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        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.39.2/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.41.0/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)
        ......@@ -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.7/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.8/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc91-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.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} cmake --version | grep "3.26.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - 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.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc91-x86/Dockerfile
        + 6
        − 6
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ARCH=i686
        ......@@ -34,15 +34,15 @@ 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.39.2/download?job=linux-i686 \
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/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.26.2/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el6-gcc91/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el6-gcc91/Dockerfile
        + 5
        − 5
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        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.39.2/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.41.0/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)
        ......@@ -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.7/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.8/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el7-gcc48-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.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} cmake --version | grep "3.26.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - 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.7"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version
        ......
        conan-el7-gcc48-x86/Dockerfile
        + 6
        − 6
        View file @ a864a514
        ......@@ -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=2.0.7 \
        CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \
        CONAN_VERSION=2.0.8 \
        CMAKE_VERSION=3.26.4 \
        GIT_VERSION=2.41.0 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \
        ARCH=i686
        ......@@ -34,15 +34,15 @@ 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.39.2/download?job=linux-i686 \
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.41.0/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.26.2/download?job=linux-i686 \
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.26.4/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.7/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.8/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \
        # Install other tools
        ......
        conan-el7-gcc48/.gitlab-ci.yml
        + 3
        − 3
        View file @ a864a514
        ......@@ -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.26.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.41.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment

        The place to be for your source code