diff --git a/README.md b/README.md index a35363e14988866d03530cc3dc954b5bbf667cce..cb3833617dacc60a3b52e57f9cee5ddba946b083 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments All images include: -- Conan 1.55.0 with Python 3.6.13 +- Conan 1.57.0 with Python 3.6.13 - Cmake 3.25.1 -- Git 2.38.1 +- Git 2.39.1 | Image | OS | Arch | GCC | | ------------------- | -------------- | ------- | --------------------------------------------| @@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy ### To build image without docker-compose with specific version of Conan ``` -$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.55.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . +$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.57.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile . ``` ## Launch diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index a9c10847fc4f9a2ea06039ad34e51b9a1a79cf27..c9496adf1baab2c16b971dca82fa7f114ca30a9c 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -29,9 +29,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index f9d9825f6e17c9ececad7a84ba84cf4839edc4a4..9de61328b07336bd1f44210b09cc4db9c25b0b00 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc44-x86/README.md b/conan-el6-gcc44-x86/README.md deleted file mode 100644 index 6a012508b4765d58028d3722eff5bab695562862..0000000000000000000000000000000000000000 --- a/conan-el6-gcc44-x86/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc44-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc44-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc44-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc44-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index d3b642d1db10eff07553c5e09335d5182c05f292..3db76c01defa7336b5764205a450a40ec8b3d769 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -29,9 +29,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index f23c670ba9d15162676212cfb13a288a1ab6c567..5c9cc4af0c0aa915855eb268272f0adaa79eb152 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc44/README.md b/conan-el6-gcc44/README.md deleted file mode 100644 index 78e3fe095b28b082fd66e86dfd4b7b0becb02bb1..0000000000000000000000000000000000000000 --- a/conan-el6-gcc44/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc44 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc44 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc44 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc44 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc44 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc44-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index 489a67e383e28de9dae0b6d32d064be8a086d913..67999dabaf3e0f5cd5117f18302cafc377b549fc 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 062c2be62b770e1bc5ba65f2382456ee116fc72a..3835c1486f5248e4c57bbeb81c7410f0c72807fe 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc73-x86/README.md b/conan-el6-gcc73-x86/README.md deleted file mode 100644 index 50d898b3804fb0c4033dbec22bace5c21e48be7d..0000000000000000000000000000000000000000 --- a/conan-el6-gcc73-x86/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc73-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc73-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc73-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc73-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index 5a0937121575b1808a85c015ccd2d8ed18bbd92b..a79b9883ca5f4f23029011e79c31b1bec22e8c9c 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index 601a18968c3a14f71bb1e310d5fb226c18d95da1..caa3a6f15b341aa1383cf3973f6c35b9e233491e 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc73/README.md b/conan-el6-gcc73/README.md deleted file mode 100644 index 0c1203405091f71b4be2ffe260dcb17b35bbf597..0000000000000000000000000000000000000000 --- a/conan-el6-gcc73/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc73 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc73 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc73 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc73 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc73 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc73-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 7b48d097d1d96cb251d1662708b2e9b8fea7b5b3..ffde067906936fdf1777756ec24f03f4ab2a78ba 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index f23d1eef32a03bc2845d799a7ec142c88e40af77..8e03ddb933a203d74069fd3ba54c72f06830232f 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc83-x86/README.md b/conan-el6-gcc83-x86/README.md deleted file mode 100644 index b988b5b3975f81456d02022f88771b30b42c111f..0000000000000000000000000000000000000000 --- a/conan-el6-gcc83-x86/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc83-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc83-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc83-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc83-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index ce0942c49c81dabab0c6e19ccf4bc08f316a5a95..6ba9454ed68bea1c8f7d54a8157d792766172c3a 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 1c90ab9d137b96c1e2d1fce93385bbe6be25aabb..1671ad6a3b1722504bdc946382dfcd8bd9b39b37 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc83/README.md b/conan-el6-gcc83/README.md deleted file mode 100644 index 072c1aea5c473af712827c35ceb4b1ad758e388f..0000000000000000000000000000000000000000 --- a/conan-el6-gcc83/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc83 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc83 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc83 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc83 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc83 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc83-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index e79d00bca7e49c085575b24041c59170657be3b1..f6005ed63ba17538a1240fcdde49448d4378f40d 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index 94a6c19755c520b1ca4a9559f405a5bcb1b38e40..e496ad9c91c2ab0444b0a41d24185b94fbf0d70e 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc91-x86/README.md b/conan-el6-gcc91-x86/README.md deleted file mode 100644 index 8b79a1297df8c04ec9fd938dfaf55edadae8b7ec..0000000000000000000000000000000000000000 --- a/conan-el6-gcc91-x86/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc91-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc91-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc91-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc91-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index ec6eadae53cf0e6d99beec13b5b31fa5e0e11e90..70fd6ba0c865c49bd7671ddcaa36d9c495508471 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 50f37a0ddbeebfd2e7b0dc2f518f7ac70e1617fa..7472322e7f7ead5f2962a0b61fc1311916eff916 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc91/README.md b/conan-el6-gcc91/README.md deleted file mode 100644 index 7536291dfa4baf1cc1cb5334e3399d281345ae60..0000000000000000000000000000000000000000 --- a/conan-el6-gcc91/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el6-gcc91 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el6-gcc91 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el6-gcc91 -``` - -To connect into the container -``` -$ docker exec -it conan-el6-gcc91 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el6-gcc91-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` - -### CentOS 6 on WSL2 -There is an issue when old Linux distribution as CentOS 6 with Docker on Windows with WSL2 - -The exit with return code 139 -https://github.com/microsoft/WSL/issues/4694#issuecomment-556095344 - -Create a file %USERPROFILE%/.wslconfig with Unix end lines (LF) -``` -[wsl2] -kernelCommandLine = vsyscall=emulate -``` - -For testing - -``` -$ docker run -ti centos:6 bash -``` - diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index cf7f3cdd20d333d6d1e4c420ca5451ae51595352..2b38c5f0059bfb4c2f6a05d738532304a5ef3f5f 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -29,9 +29,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 5b1f12ee24fb40384e68454508dbd71e18cbadd6..263d0523cfe25da44a8b270376ae0133b268172a 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc48-x86/README.md b/conan-el7-gcc48-x86/README.md deleted file mode 100644 index d9e14c037f6e8e9b8f1eba8c09c69a104ff812e0..0000000000000000000000000000000000000000 --- a/conan-el7-gcc48-x86/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc48-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc48-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc48-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc48-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 53fac104f9299aaaab9a766a399be202f0190675..8f0db5a8d180d877f25c07174f863bf46ed6541f 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -29,9 +29,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index ff074d0d2e60e53a0c2f95421431e5a8ff17759f..4d281e865951f76dd14116ea0f72c204ca027c30 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc48/README.md b/conan-el7-gcc48/README.md deleted file mode 100644 index 5ddcd57f3bca0f64dad8396ad24d225f6dfa9f4c..0000000000000000000000000000000000000000 --- a/conan-el7-gcc48/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc48 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc48 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc48 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc48 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc48 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc48-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index baa9413e5790b282983c1d73ad3f65f3db0eabf7..31d7848a4a140c6bd4fad17325a85b280119a615 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 9f380a469e2839cc73a0af9060245af8b892e2c9..994dcb79cbf30d961514c6241c254cb1c0aa2ed8 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc73-x86/README.md b/conan-el7-gcc73-x86/README.md deleted file mode 100644 index 489d39f839cd5ced06209952c1e8efa0e9a203ae..0000000000000000000000000000000000000000 --- a/conan-el7-gcc73-x86/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc73-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc73-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc73-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc73-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index b688121f569d20f38500ff67c75ad642bd2be011..58ca1a025445717ff177dd4e256d064d74a0a102 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 7241993217848f880919157269bc5cdd06014123..f3c3ecd635f206496190c180a74823cfff59ece9 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc73/README.md b/conan-el7-gcc73/README.md deleted file mode 100644 index acf01a07db50b25a64a7d8892690aae7f346ec3d..0000000000000000000000000000000000000000 --- a/conan-el7-gcc73/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc73 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc73 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc73 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc73 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc73 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc73-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index 250965b439d7f671204b6406f4125002609e3ef8..a20f7e413d78b6ee5eb07c3d24aca0080b105c82 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index b0adcd129e7b35ca4e12ad99dd84680e912fa356..2cfd38ad9f860beec9c0890828ad71dc3bb98ff5 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc82-x86/README.md b/conan-el7-gcc82-x86/README.md deleted file mode 100644 index 3d50db81dd52f6d128ccb8e08218c9aa91dcf691..0000000000000000000000000000000000000000 --- a/conan-el7-gcc82-x86/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc82-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc82-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc82-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc82-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index 8252e55c32e0b93c85c9f6f18b5c1a7ff129b515..7aba10c4e22f3bd71c9fcb5a10e928dc44309f09 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index f1c3430a8b725aac532a3d8b2016ab368adefd82..1653437a67b62de4a68b11a35f30636fda388a33 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc83/README.md b/conan-el7-gcc83/README.md deleted file mode 100644 index 4400e025fdb69d463d9a4758fac9ca6feaf23abb..0000000000000000000000000000000000000000 --- a/conan-el7-gcc83/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc83 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc83 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc83 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc83 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 5d012a48772eb1b6ffcf9be4cb9063214e45cde0..042a55ebb191f803ab3ba9751d634d89870243b3 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index 58c5c5ed263cc50c9ba760736e46c7d22171b105..46072fd385c655661e2fc2ffae403e51922557ae 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc93-x86/README.md b/conan-el7-gcc93-x86/README.md deleted file mode 100644 index c3e7e159369d1727d4359d45c8e128bc320886c7..0000000000000000000000000000000000000000 --- a/conan-el7-gcc93-x86/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc93-x86 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93-x86 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc93-x86 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93-x86 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc93-x86 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc93-x86 linux32 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 013ddbaebb28660150c794c866b9de56da5bd993..900e6d90fa0590d02995e9e939732a2f3a527399 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -28,9 +28,9 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.1" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" - - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.57.0" release: stage: release diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index 67a1af46282dd29a16a0d302aa771f58e125243c..2f698b50cecdc1ce1b4f905e258c84c4fc0afcf4 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -3,9 +3,9 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ - CONAN_VERSION=1.55.0 \ + CONAN_VERSION=1.57.0 \ CMAKE_VERSION=3.25.1 \ - GIT_VERSION=2.38.1 \ + GIT_VERSION=2.39.1 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.38.1/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.1/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc93/README.md b/conan-el7-gcc93/README.md deleted file mode 100644 index 8bc02985d78a1926f6833e0cbef532ecbf835023..0000000000000000000000000000000000000000 --- a/conan-el7-gcc93/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Conan docker tools for Soleil - -Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker images for legacy Soleil environments - -Image includes: -- Python 3.6.13 -- Conan 1.55.0 -- Cmake 3.25.1 -- Git 2.38.1 - -## Build - -### To build image with docker-compose - -``` -docker-compose build conan-el7-gcc93 -``` - -### To build image without docker-compose - -``` -docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93 . -``` - -## Launch - -### To launch with docker-compose -``` -$ docker-compose run --rm conan-el7-gcc93 -``` - -### To launch without docker-compose - -``` -$ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc93 -``` - -### To launch containers in detached mode with docker-compose - -To launch the containers -``` -$ docker-compose up -d conan-el7-gcc93 -``` - -To connect into the container -``` -$ docker exec -it conan-el7-gcc93 bash -``` - -## Known issues - -### BuildKit -When you build an image that depends of other, you can be unable to get dependency if buildKit is enable -``` - => ERROR [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest 1.5s ------- - > [internal] load metadata for docker.io/library/conan-el7-gcc93-x86:latest: ------- -failed to solve: rpc error: code = Unknown desc = failed to solve with frontend dockerfile.v0: failed to create LLB definition: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed -``` - -To fix it -``` -export DOCKER_BUILDKIT=0 -``` diff --git a/dependencies.dot b/dependencies.dot index 5f01cf331c9be3cae2a6cf9eecd6852945e69161..972608014cf88d43a162cb02f16894644aecb57d 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -57,13 +57,13 @@ digraph CentOS_conan { "python-3.6.13-linux-x86_64" "python-3.6.13-linux-i686" - "git-2.38.1-linux-x86_64" - "git-2.38.1-linux-i686" + "git-2.39.1-linux-x86_64" + "git-2.39.1-linux-i686" "cmake-3.25.1-linux-i686" - "conan-1.55.0-linux-x86_64" - "conan-1.55.0-linux-i686" + "conan-1.57.0-linux-x86_64" + "conan-1.57.0-linux-i686" {rank = same; "dev-el6-gcc44"; "dev-el6-gcc44-x86"; "dev-el7-gcc48"; "dev-el7-gcc48-x86"} {rank = same; "dev-el6-gcc73"; "dev-el6-gcc83"; "dev-el6-gcc91"; "dev-el6-gcc73-x86"; "dev-el6-gcc83-x86"; "dev-el6-gcc91-x86"; "dev-el7-gcc73"; "dev-el7-gcc83"; "dev-el7-gcc93"; "dev-el7-gcc73-x86"; "dev-el7-gcc82-x86"; "dev-el7-gcc93-x86"} @@ -123,8 +123,8 @@ digraph CentOS_conan { # Use edge [dir=back arrowtail=vee] - "conan-el6-gcc91" -> "git-2.38.1-linux-x86_64" - "conan-el6-gcc91-x86" -> "git-2.38.1-linux-i686" + "conan-el6-gcc91" -> "git-2.39.1-linux-x86_64" + "conan-el6-gcc91-x86" -> "git-2.39.1-linux-i686" "conan-el6-gcc91" -> "python-3.6.13-linux-x86_64" "conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686" @@ -132,8 +132,8 @@ digraph CentOS_conan { "dev-el6-gcc73-x86" -> "cmake-3.25.1-linux-i686" "dev-el7-gcc73-x86" -> "cmake-3.25.1-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-1.55.0-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-1.55.0-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-1.57.0-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-1.57.0-linux-i686" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73" @@ -155,25 +155,25 @@ digraph CentOS_conan { "python-3.6.13-linux-i686" -> "conan-el7-gcc82-x86" "python-3.6.13-linux-i686" -> "conan-el7-gcc93-x86" - "git-2.38.1-linux-x86_64" -> "conan-el6-gcc44" - "git-2.38.1-linux-x86_64" -> "conan-el6-gcc73" - "git-2.38.1-linux-x86_64" -> "conan-el6-gcc83" - "git-2.38.1-linux-x86_64" -> "conan-el6-gcc91" + "git-2.39.1-linux-x86_64" -> "conan-el6-gcc44" + "git-2.39.1-linux-x86_64" -> "conan-el6-gcc73" + "git-2.39.1-linux-x86_64" -> "conan-el6-gcc83" + "git-2.39.1-linux-x86_64" -> "conan-el6-gcc91" - "git-2.38.1-linux-i686" -> "conan-el6-gcc44-x86" - "git-2.38.1-linux-i686" -> "conan-el6-gcc73-x86" - "git-2.38.1-linux-i686" -> "conan-el6-gcc83-x86" - "git-2.38.1-linux-i686" -> "conan-el6-gcc91-x86" + "git-2.39.1-linux-i686" -> "conan-el6-gcc44-x86" + "git-2.39.1-linux-i686" -> "conan-el6-gcc73-x86" + "git-2.39.1-linux-i686" -> "conan-el6-gcc83-x86" + "git-2.39.1-linux-i686" -> "conan-el6-gcc91-x86" - "git-2.38.1-linux-x86_64" -> "conan-el7-gcc48" - "git-2.38.1-linux-x86_64" -> "conan-el7-gcc73" - "git-2.38.1-linux-x86_64" -> "conan-el7-gcc83" - "git-2.38.1-linux-x86_64" -> "conan-el7-gcc93" + "git-2.39.1-linux-x86_64" -> "conan-el7-gcc48" + "git-2.39.1-linux-x86_64" -> "conan-el7-gcc73" + "git-2.39.1-linux-x86_64" -> "conan-el7-gcc83" + "git-2.39.1-linux-x86_64" -> "conan-el7-gcc93" - "git-2.38.1-linux-i686" -> "conan-el7-gcc48-x86" - "git-2.38.1-linux-i686" -> "conan-el7-gcc73-x86" - "git-2.38.1-linux-i686" -> "conan-el7-gcc82-x86" - "git-2.38.1-linux-i686" -> "conan-el7-gcc93-x86" + "git-2.39.1-linux-i686" -> "conan-el7-gcc48-x86" + "git-2.39.1-linux-i686" -> "conan-el7-gcc73-x86" + "git-2.39.1-linux-i686" -> "conan-el7-gcc82-x86" + "git-2.39.1-linux-i686" -> "conan-el7-gcc93-x86" "cmake-3.25.1-linux-i686" -> "conan-el6-gcc44-x86" "cmake-3.25.1-linux-i686" -> "conan-el6-gcc73-x86" @@ -185,23 +185,23 @@ digraph CentOS_conan { "cmake-3.25.1-linux-i686" -> "conan-el7-gcc82-x86" "cmake-3.25.1-linux-i686" -> "conan-el7-gcc93-x86" - "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc44" - "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc73" - "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc83" - "conan-1.55.0-linux-x86_64" -> "conan-el6-gcc91" - - "conan-1.55.0-linux-i686" -> "conan-el6-gcc44-x86" - "conan-1.55.0-linux-i686" -> "conan-el6-gcc73-x86" - "conan-1.55.0-linux-i686" -> "conan-el6-gcc83-x86" - "conan-1.55.0-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc48" - "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc73" - "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc83" - "conan-1.55.0-linux-x86_64" -> "conan-el7-gcc93" - - "conan-1.55.0-linux-i686" -> "conan-el7-gcc48-x86" - "conan-1.55.0-linux-i686" -> "conan-el7-gcc73-x86" - "conan-1.55.0-linux-i686" -> "conan-el7-gcc82-x86" - "conan-1.55.0-linux-i686" -> "conan-el7-gcc93-x86" + "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc44" + "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc73" + "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc83" + "conan-1.57.0-linux-x86_64" -> "conan-el6-gcc91" + + "conan-1.57.0-linux-i686" -> "conan-el6-gcc44-x86" + "conan-1.57.0-linux-i686" -> "conan-el6-gcc73-x86" + "conan-1.57.0-linux-i686" -> "conan-el6-gcc83-x86" + "conan-1.57.0-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc48" + "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc73" + "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc83" + "conan-1.57.0-linux-x86_64" -> "conan-el7-gcc93" + + "conan-1.57.0-linux-i686" -> "conan-el7-gcc48-x86" + "conan-1.57.0-linux-i686" -> "conan-el7-gcc73-x86" + "conan-1.57.0-linux-i686" -> "conan-el7-gcc82-x86" + "conan-1.57.0-linux-i686" -> "conan-el7-gcc93-x86" }