diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db96faccb0c3937c89121325c7dd6bac6bc851eb..0e492b5d69fbc2f151aff8617f457d9d5e2eb7a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,26 +19,26 @@ stages: # - images .base_docker_store_images: stage: remote_images - image: docker:latest - tags: - - privileged - services: - - name: docker:dind - variables: - DOCKER_TLS_CERTDIR: "/certs" - before_script: - - apk add --update make bash - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - script: - - touch /root/.Xauthority - # Hack BASH_SOURCE into sourced files, docker its sh shell won't set this - - export BASH_SOURCE=$(pwd)/bootstrap/etc/lofar20rc.sh - # source the lofarrc file and mask its non zero exit code - - . bootstrap/etc/lofar20rc.sh || true - # Allow docker image script test to execute - - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh - # 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: docker:latest + tags: + - privileged + services: + - name: docker:dind + variables: + DOCKER_TLS_CERTDIR: "/certs" + before_script: + - apk add --update make bash + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - touch /root/.Xauthority + # Hack BASH_SOURCE into sourced files, docker its sh shell won't set this + - export BASH_SOURCE=$(pwd)/bootstrap/etc/lofar20rc.sh + # source the lofarrc file and mask its non zero exit code + - . bootstrap/etc/lofar20rc.sh || true + # Allow docker image script test to execute + - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh + # Do not remove 'bash' or statement will be ignored by primitive docker shell + - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh docker_store_images_master_tag: extends: .base_docker_store_images only: