diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index 2e81884c6d6c1c44795a39d6f91a9652ecdd4282..a8c98e34cf00e0226257c3d49894a60f72f56301 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -32,6 +32,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 7b35e501367f88896466283c49ec44f1844226c5..13fda7430246b1d57e2031ead46d0defb995374a 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/usr/bin/g++ \ CC=/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index cb16958a5c7895e1f72df9622064cbab15402427..87a284cb2413e3a3df1c45f68958eaf4db829bb2 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -32,6 +32,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 12b997384f4f806d31783a727aa6b49b0bc4f958..0b5dca653eda6a11f8e01d968f5536678d10590a 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/usr/bin/g++ \ CC=/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index 80ab8a38daecbb8974ba6c8222d7c1d9f01ce7b3..0f3fa2021bfd21fe95c4080a23dd5edd3ee0a71e 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 29a02cd4f5a399be09ad410b92496d5024dd092c..20eeef430adda21e8c115e4b4bec25b223f459e6 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index e257f8768cf78fb5ba99045a7c92ff72ee10eef7..79299bebfeb8936c4ee39b4f3626b25fb3b2ed69 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index d077b743691dc100c30366507bd20d2886e785bd..421a6f24b0694ff57b9783851c67d652ad85bfa9 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 4484c2c14183536e73e6f3cd3649b62a47187794..76b9b19d0fe0402de6848c427a972a00e3dda70a 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 286279887b5b1813aadbf3ea81943653683f62ef..9f38ef6a92e99d7a7ea53564b482b3dee64bc0de 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-8/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index 5abec774135dd1a9928133383473308e5c3e93b7..b699066deca43ba14aa0e67d48fd39cb6bd17ac5 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 363cf77f10827999ac93795ada0edcc80d0198c0..6e2b9afc8593b0b8f7b3a8527e0d1ed1b5bc114e 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-8/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index e0024edca4b73b54893f4573b264cdacaa0a8431..85932437153aba1f8edd6c16be841bb3146e0a5f 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index e32078b578665612d8eca263dc977d028fb992fe..a7f7d3808d234cbcbd40748602ffa26bd17c07a8 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-9/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 511ad8f8744b3dbcb5fc74ae57c2c5284bdd9c04..05307dd93be5c6bc35c0c0236766e2795ce2a766 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 9d25918288e556b65af15f37a62a0e36b9954fa2..a62f255e4273a66838e282cbbb98650a00d6aa42 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-9/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index d838270091a50637d53c975e93b6ad1bf78ee2ab..39ec4b7118a702bb43336aab5afcc6884505baa2 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -32,6 +32,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index a03bcd852a3938c86b2cdb4d14b6c6b108f3b3a5..a4a222152962aecc6c6bbbe792d16435aecb8a38 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/usr/bin/g++ \ CC=/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 3dc3a93e218f79b0aabe1c10c6cb2b47790e092c..cc4e06e99dcbcb1986b24fd99d212b184ced3a5f 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -32,6 +32,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index 224591b2da8ce91ac1a5cb55df89293c2e215a9d..990cd306a517e0bf8a6750cc72c36a853e73b2cc 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/usr/bin/g++ \ CC=/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd g1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index e380308590e55af9d06b4b1d2a18c417e61e162c..a758b051360467d51198170367bd2e5bf83386ca 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 7e0efb03db99afda2c2db3867a7ce03efc9f1fd2..608e7ab365e3620a074a74e11d0278836523c0de 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index b613b34c2535c4ce95b5fcb80065c14101140163..f481d9b6e7a0042e3706d859cd2995eb51ba9335 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 11b436fefbb231263074403cc7807f568bb50ebe..c462e7f9d20d31049ab4838f83c7e74885c4e989 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd g1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index cfeebdc50814be9df3a8ed0aa707eb099ba081cb..84a984ba3f526ed36911752f5dd270ee2d0a90ff 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index 15dfd5f5e448a01369ed51e317cdddfa3ae38fa9..1a937abaed5b6d74fc6a51fc535859419e466e70 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-8/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index 8b45a244f6156075fa29432a8f242083178e6561..ddbcb51a0c4e5ef92e0745d8380612d1ed161e65 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index 8f987d048e974712a32eb1ff0dfc62829140610b..fa6485fbf8900fff330f8c6144206a84ec94be3b 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-8/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd g1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 3a073a619fe496b21d5c37b05ece544f701ef082..08afa55cea834ac4054e98db8dfc8eb404edf36e 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -30,7 +30,8 @@ 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} git --version | grep "2.39.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index 982de3adb910a6b02834123b1e3aa4b5b97cd4dc..0ac52b027312c69be111b2577cc8d21ec2a63fad 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-9/root/usr/bin/gcc @@ -45,6 +45,11 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* \ # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 6503d110fb165dfe248c70c9bf834057028fc10c..d583851ac7eee118e834744641aced4c3c0122c8 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -31,6 +31,8 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version release: stage: release diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index c06322a47a9e51db789b572be8ea94ebe6d7d563..0cd0062067862325f6d2590d4e75aaaf89b06472 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ - PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CC=/opt/rh/devtoolset-9/root/usr/bin/gcc @@ -47,7 +47,12 @@ RUN groupadd g1001 -g 1001 \ # Install conan && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ - && rm ${CONAN_ROOT}.zip + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* USER conan WORKDIR /home/conan