Skip to content
Snippets Groups Projects
Commit 3c226768 authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Pin image generation to envinf1.

Otherwise we get illegal instructions when compiling OGS when
the image was built on e.g. envinf2.
parent e35d5146
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ build container images:
- ThirdParty/container-maker
- scripts/ci/jobs/build_image.yml
dependencies: [meta_container]
tags: [docker-shell]
tags: [envinf1-shell]
extends: .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -29,7 +29,7 @@ build xunit-to-junit image:
- scripts/docker/saxon/**/*
- scripts/ci/jobs/build_image.yml
tags:
- docker-shell
- envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
......@@ -44,7 +44,7 @@ build pre-commit image:
- scripts/docker/Dockerfile.pre-commit
- scripts/ci/jobs/build_image.yml
tags:
- docker-shell
- envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $PRECOMMIT_IMAGE -t $PRECOMMIT_IMAGE -f scripts/docker/Dockerfile.pre-commit scripts/docker
......@@ -58,7 +58,7 @@ build web image:
- scripts/docker/Dockerfile.web
- scripts/ci/jobs/build_image.yml
tags:
- docker-shell
- envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $WEB_IMAGE -t $WEB_IMAGE -f scripts/docker/Dockerfile.web scripts/docker
......
container:
stage: package
tags: [docker-shell]
tags: [envinf2-shell]
needs: [meta]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment