Skip to content
Snippets Groups Projects
Commit d4a9d738 authored by Corné Lukken's avatar Corné Lukken
Browse files

Merge branch 'L2SS-1530-fix-lofar-device-image-building' into 'master'

L2SS-1530: fix lofar-device-image building

Closes L2SS-1530

See merge request !740
parents e7fd1141 93b3c5d5
No related branches found
No related tags found
1 merge request!740L2SS-1530: fix lofar-device-image building
......@@ -115,7 +115,6 @@ docker_build_image:
parallel:
matrix:
- IMAGE:
- lofar-device-base
- ec-sim
- http-json-schemas
- prometheus
......@@ -136,6 +135,15 @@ docker_build_image:
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh $IMAGE $tag
docker_build_image_device_base:
extends: .base_docker_images
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
- if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base $tag
newline_at_eof:
stage: linting
before_script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment