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

Update to Conan 2.0.2

parent c6f1bce7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 39 additions and 48 deletions
README.md
+ 2
− 2
View file @ 5729e7eb
...@@ -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.1 with Python 3.6.13 - Conan 2.0.2 with Python 3.6.13
- Cmake 3.25.2 - Cmake 3.25.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.1 -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.2 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
``` ```
## Launch ## Launch
......
conan-el6-gcc44-x86/.gitlab-ci.yml
+ 1
− 1
View file @ 5729e7eb
...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - 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.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.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc44-x86/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/usr/bin/g++ \ CXX=/usr/bin/g++ \
CC=/usr/bin/gcc CC=/usr/bin/gcc
...@@ -42,7 +41,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +41,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.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.1" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc44/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/usr/bin/g++ \ CXX=/usr/bin/g++ \
CC=/usr/bin/gcc CC=/usr/bin/gcc
...@@ -45,7 +44,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +44,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - 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.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.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc73-x86/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
...@@ -42,7 +41,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +41,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.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.1" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc73/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
...@@ -45,7 +44,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +44,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - 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.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.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc83-x86/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-8/root/usr/bin/gcc CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
...@@ -42,7 +41,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +41,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.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.1" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc83/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-8/root/usr/bin/gcc CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
...@@ -45,7 +44,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +44,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - 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.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.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc91-x86/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-9/root/usr/bin/gcc CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
...@@ -42,7 +41,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -42,7 +41,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -30,7 +30,7 @@ test: ...@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.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.1" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el6-gcc91/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \ CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \
CC=/opt/rh/devtoolset-9/root/usr/bin/gcc CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
...@@ -45,7 +44,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -45,7 +44,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - 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.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.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
release: release:
stage: release stage: release
......
conan-el7-gcc48-x86/Dockerfile
+ 3
− 4
View file @ 5729e7eb
...@@ -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.1 \ CONAN_VERSION=2.0.2 \
CMAKE_VERSION=3.25.2 \ CMAKE_VERSION=3.25.2 \
GIT_VERSION=2.39.2 \ GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \ DEVTOOLS_ROOT=/usr/Local/devtools \
...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ ...@@ -14,8 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_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}/bin:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ 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} \
PYTHONPATH=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}/lib/python3.6/site-packages \
CXX=/usr/bin/g++ \ CXX=/usr/bin/g++ \
CC=/usr/bin/gcc CC=/usr/bin/gcc
...@@ -42,7 +41,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -42,7 +41,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.1/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.2/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
+ 1
− 1
View file @ 5729e7eb
...@@ -31,7 +31,7 @@ test: ...@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.2" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.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.1" - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.2"
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