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

Update to Conan 1.57.0 and Git 2.39.1

parent fb38e7c0
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 35 additions and 539 deletions
README.md
+ 3
− 3
View file @ ae057593
......@@ -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
......
conan-el6-gcc44-x86/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc44-x86/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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
......
conan-el6-gcc44-x86/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc44/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc44/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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)
......
conan-el6-gcc44/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc73-x86/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc73-x86/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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
......
conan-el6-gcc73-x86/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc73/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc73/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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)
......
conan-el6-gcc73/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc83-x86/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc83-x86/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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
......
conan-el6-gcc83-x86/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc83/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
conan-el6-gcc83/Dockerfile
+ 3
− 3
View file @ ae057593
......@@ -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)
......
conan-el6-gcc83/README.md deleted 100644 → 0
+ 0
− 84
View file @ fb38e7c0
# 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
```
conan-el6-gcc91-x86/.gitlab-ci.yml
+ 2
− 2
View file @ ae057593
......@@ -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
......
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