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

Fix wrong version of gcc 8 for el7 x86 and remove .gitlab folder go back to...

Fix wrong version of gcc 8 for el7 x86 and remove .gitlab folder go back to standard filename for gitlab pipeline file
parent cbd4f75e
No related branches found
No related tags found
No related merge requests found
Showing
with 67 additions and 68 deletions
include: .gitlab/main.gitlab-ci.yml
stages:
- triggers
conan-el6-gcc44:
stage: triggers
trigger:
include: conan-el6-gcc44/.gitlab-ci.yml
strategy: depend
rules:
- changes:
- conan-el6-gcc44/Dockerfile
conan-el6-gcc44-x86:
stage: triggers
trigger:
include: conan-el6-gcc44-x86/.gitlab-ci.yml
strategy: depend
rules:
- changes:
- conan-el6-gcc44-x86/Dockerfile
conan-el7-gcc48:
stage: triggers
trigger:
include: conan-el7-gcc48/.gitlab-ci.yml
strategy: depend
rules:
- changes:
- conan-el7-gcc48/Dockerfile
conan-el7-gcc48-x86:
stage: triggers
trigger:
include: conan-el7-gcc48-x86/.gitlab-ci.yml
strategy: depend
rules:
- changes:
- conan-el7-gcc48-x86/Dockerfile
\ No newline at end of file
stages:
- triggers
conan-el6-gcc44:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc44.gitlab-ci.yml
strategy: depend
# rules:
# - changes:
# - conan-el6-gcc44/Dockerfile
conan-el6-gcc44-x86:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc44-x86.gitlab-ci.yml
strategy: depend
# rules:
# - changes:
# - conan-el6-gcc44-x86/Dockerfile
conan-el7-gcc48:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc48.gitlab-ci.yml
strategy: depend
# rules:
# - changes:
# - conan-el7-gcc48/Dockerfile
conan-el7-gcc48-x86:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc48-x86.gitlab-ci.yml
strategy: depend
# rules:
# - changes:
# - conan-el7-gcc48-x86/Dockerfile
\ No newline at end of file
......@@ -43,7 +43,7 @@ release:
conan-el6-gcc73-x86:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc73-x86.gitlab-ci.yml
include: conan-el6-gcc73-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc73-x86
......@@ -53,7 +53,7 @@ conan-el6-gcc73-x86:
conan-el6-gcc83-x86:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc83-x86.gitlab-ci.yml
include: conan-el6-gcc83-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc83-x86
......@@ -63,7 +63,7 @@ conan-el6-gcc83-x86:
conan-el6-gcc91-x86:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc91-x86.gitlab-ci.yml
include: conan-el6-gcc91-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc91-x86
......
......@@ -43,7 +43,7 @@ release:
conan-el6-gcc73:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc73.gitlab-ci.yml
include: conan-el6-gcc73/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc73
......@@ -53,7 +53,7 @@ conan-el6-gcc73:
conan-el6-gcc83:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc83.gitlab-ci.yml
include: conan-el6-gcc83/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc83
......@@ -63,7 +63,7 @@ conan-el6-gcc83:
conan-el6-gcc91:
stage: triggers
trigger:
include: .gitlab/conan-el6-gcc91.gitlab-ci.yml
include: conan-el6-gcc91/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el6-gcc91
......
......@@ -43,27 +43,27 @@ release:
conan-el7-gcc73-x86:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc73-x86.gitlab-ci.yml
include: conan-el7-gcc73-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc73-x86
CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
conan-el7-gcc83-x86:
conan-el7-gcc82-x86:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc83-x86.gitlab-ci.yml
include: conan-el7-gcc82-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc83-x86
NAME: conan-el7-gcc82-x86
CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
conan-el7-gcc93-x86:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc93-x86.gitlab-ci.yml
include: conan-el7-gcc93-x86/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc93-x86
......
......@@ -43,7 +43,7 @@ release:
conan-el7-gcc73:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc73.gitlab-ci.yml
include: conan-el7-gcc73/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc73
......@@ -53,7 +53,7 @@ conan-el7-gcc73:
conan-el7-gcc83:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc83.gitlab-ci.yml
include: conan-el7-gcc83/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc83
......@@ -63,7 +63,7 @@ conan-el7-gcc83:
conan-el7-gcc93:
stage: triggers
trigger:
include: .gitlab/conan-el7-gcc93.gitlab-ci.yml
include: conan-el7-gcc93/.gitlab-ci.yml
strategy: depend
variables:
NAME: conan-el7-gcc93
......
......@@ -3,7 +3,7 @@ services:
- docker:dind
variables:
NAME: conan-el7-gcc83-x86
NAME: conan-el7-gcc82-x86
CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
......@@ -26,7 +26,7 @@ test:
script:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7"
- 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} gcc --version | grep "gcc (GCC) 8\.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.24.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.36.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
......
File moved
......@@ -13,38 +13,38 @@ Image includes:
### To build image with docker-compose
```
docker-compose build conan-el7-gcc83-x86
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-gcc83-x86 .
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-gcc83-x86
$ 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-gcc83-x86
$ 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-gcc83-x86
$ docker-compose up -d conan-el7-gcc82-x86
```
To connect into the container
```
$ docker exec -it conan-el7-gcc83-x86 linux32 bash
$ docker exec -it conan-el7-gcc82-x86 linux32 bash
```
## Known issues
......@@ -52,9 +52,9 @@ $ docker exec -it conan-el7-gcc83-x86 linux32 bash
### 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-gcc83-x86:latest 1.5s
=> ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s
------
> [internal] load metadata for docker.io/library/conan-el7-gcc83-x86:latest:
> [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
```
......
version: "3.8"
services:
conan-el7-gcc83-x86:
conan-el7-gcc82-x86:
build:
context: .
args:
- http_proxy
- https_proxy
- no_proxy
image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc83-x86"
container_name: conan-el7-gcc83-x86
image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el7-gcc82-x86"
container_name: conan-el7-gcc82-x86
platform: "linux/386"
tty: true
environment:
......
......@@ -52,9 +52,9 @@ $ docker exec -it conan-el7-gcc83 bash
### 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-gcc83-x86:latest 1.5s
=> ERROR [internal] load metadata for docker.io/library/conan-el7-gcc82-x86:latest 1.5s
------
> [internal] load metadata for docker.io/library/conan-el7-gcc83-x86:latest:
> [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
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment