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

Update to Conan 1.59.0, Git 2.39.2 and Cmake 3.25.2

parent 685e35ec
Branches
Tags 1.59.0
No related merge requests found
Pipeline #1869 passed
Stage: triggers
Pipeline: conan-docker-tools

#1885

    Pipeline: conan-docker-tools

    #1884

      Pipeline: conan-docker-tools

      #1883

        +13
        Show whitespace changes
        Inline Side-by-side
        Showing
        with 84 additions and 84 deletions
        README.md
        + 4
        − 4
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
        Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
        All images include: All images include:
        - Conan 1.57.0 with Python 3.6.13 - Conan 1.59.0 with Python 3.6.13
        - Cmake 3.25.1 - Cmake 3.25.2
        - Git 2.39.1 - Git 2.39.2
        | Image | OS | Arch | GCC | | Image | OS | Arch | GCC |
        | ------------------- | -------------- | ------- | --------------------------------------------| | ------------------- | -------------- | ------- | --------------------------------------------|
        ...@@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy ...@@ -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 ### To build image without docker-compose with specific version of Conan
        ``` ```
        $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.57.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.59.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        ``` ```
        ## Launch ## Launch
        ......
        conan-el6-gcc44-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -28,10 +28,10 @@ test: ...@@ -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} 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} 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} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc44-x86/Dockerfile
        + 6
        − 6
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=i686 ARCH=i686
        ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake # Install cmake
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686 \ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.2/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \ && rm ${CMAKE_ROOT}.zip \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc44/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -28,10 +28,10 @@ test: ...@@ -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} 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} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc44/Dockerfile
        + 5
        − 5
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=x86_64 ARCH=x86_64
        ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
        ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \ --exclude=share/vim \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip && rm ${CONAN_ROOT}.zip
        ......
        conan-el6-gcc73-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} 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} gcc --version | grep "gcc (GCC) 7\.3"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc73-x86/Dockerfile
        + 6
        − 6
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=i686 ARCH=i686
        ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake # Install cmake
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686 \ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.2/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \ && rm ${CMAKE_ROOT}.zip \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc73/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc73/Dockerfile
        + 5
        − 5
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=x86_64 ARCH=x86_64
        ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
        ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \ --exclude=share/vim \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip && rm ${CONAN_ROOT}.zip
        ......
        conan-el6-gcc83-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} 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} gcc --version | grep "gcc (GCC) 8\.3"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc83-x86/Dockerfile
        + 6
        − 6
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=i686 ARCH=i686
        ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake # Install cmake
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686 \ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.2/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \ && rm ${CMAKE_ROOT}.zip \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc83/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc83/Dockerfile
        + 5
        − 5
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=x86_64 ARCH=x86_64
        ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
        ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \ --exclude=share/vim \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip && rm ${CONAN_ROOT}.zip
        ......
        conan-el6-gcc91-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} 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} gcc --version | grep "gcc (GCC) 9\.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc91-x86/Dockerfile
        + 6
        − 6
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=i686 ARCH=i686
        ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,15 +34,15 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake # Install cmake
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686 \ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.2/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \ && rm ${CMAKE_ROOT}.zip \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc91/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -27,10 +27,10 @@ test: ...@@ -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} 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} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el6-gcc91/Dockerfile
        + 5
        − 5
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=x86_64 ARCH=x86_64
        ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11)
        ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
        --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
        --exclude=share/vim \ --exclude=share/vim \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-x86_64 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip && rm ${CONAN_ROOT}.zip
        ......
        conan-el7-gcc48-x86/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -28,10 +28,10 @@ test: ...@@ -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} 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} 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} gcc --version | grep "gcc (GCC) 4\.8"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        conan-el7-gcc48-x86/Dockerfile
        + 6
        − 6
        View file @ 273d0cf6
        ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \ ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.57.0 \ CONAN_VERSION=1.59.0 \
        CMAKE_VERSION=3.25.1 \ CMAKE_VERSION=3.25.2 \
        GIT_VERSION=2.39.1 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        OS=linux \ OS=linux \
        ARCH=i686 ARCH=i686
        ...@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \ ...@@ -34,15 +34,15 @@ RUN groupadd g1001 -g 1001 \
        && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${PYTHON_ROOT}.zip \ && rm ${PYTHON_ROOT}.zip \
        # Install git # Install git
        && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && 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} \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${GIT_ROOT}.zip \ && rm ${GIT_ROOT}.zip \
        # Install cmake # Install cmake
        && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686 \ && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.2/download?job=linux-i686 \
        && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CMAKE_ROOT}.zip \ && rm ${CMAKE_ROOT}.zip \
        # Install conan # Install conan
        && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.59.0/download?job=linux-i686 \
        && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el7-gcc48/.gitlab-ci.yml
        + 3
        − 3
        View file @ 273d0cf6
        ...@@ -28,10 +28,10 @@ test: ...@@ -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} 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} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8"
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - 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} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.59.0"
        release: release:
        stage: release stage: release
        ......
        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