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

Update to Conan 2.0.7

parent 7c787557
No related branches found
No related tags found
No related merge requests found
Pipeline #2360 passed
Pipeline: conan-docker-tools

#2376

    Pipeline: conan-docker-tools

    #2375

      Pipeline: conan-docker-tools

      #2374

        +13
        Showing
        with 30 additions and 30 deletions
        ...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
        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 2.0.5 with Python 3.6.13 - Conan 2.0.7 with Python 3.6.13
        - Cmake 3.26.2 - Cmake 3.26.2
        - Git 2.39.2 - Git 2.39.2
        ...@@ -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=2.0.5 -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.7 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        ``` ```
        ## Launch ## Launch
        ......
        ...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
        && 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/2.0.5/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.7/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 "..."
        ......
        ...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -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/2.0.5/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.7/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
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
        && 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/2.0.5/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.7/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 "..."
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -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/2.0.5/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.7/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
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
        && 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/2.0.5/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.7/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 "..."
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -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/2.0.5/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.7/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
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
        && 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/2.0.5/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.7/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 "..."
        ......
        ...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -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/2.0.5/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.7/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
        ......
        ...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        ...@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de ...@@ -3,7 +3,7 @@ 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=2.0.5 \ CONAN_VERSION=2.0.7 \
        CMAKE_VERSION=3.26.2 \ CMAKE_VERSION=3.26.2 \
        GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
        DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
        ...@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
        && 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/2.0.5/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.7/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 "..."
        ......
        ...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2" - 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} 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 "2.0.5" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
        release: release:
        stage: release stage: release
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment