From 04a1dd0ee1eda0e58db8c19963edd3cb768a1679 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Thu, 11 Nov 2021 10:19:12 +0000
Subject: [PATCH] L2SS-205: Push remote images to local registry
---
.gitlab-ci.yml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 772a01817..88167a208 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,7 @@ stages:
# script:
# - cd tangostationcontrol
# - python setup.py bdist_wheel
-docker_images:
+docker_store_images:
stage: images
image: docker:latest
tags:
@@ -107,12 +107,16 @@ docker_images:
variables:
DOCKER_TLS_CERTDIR: "/certs"
before_script:
- - apk add --update make bash docker-compose
- - apk add --update bind-tools
+# - apk add --update make bash docker-compose
+# - apk add --update bind-tools
- 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
- - cd docker-compose
- - make pull
+# 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
--
GitLab