L2SS-205: Push / pull correct images

.gitlab-ci.yml

@@ -93,28 +93,28 @@ docker_build_image_all:
       - master
   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 elk $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk-configure-host $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh prometheus $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh itango $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh grafana $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh jupyter $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sst $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-unb2 $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst $tag
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk-configure-host latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh prometheus latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh itango latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh grafana latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh jupyter latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sst latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-unb2 latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst latest
 docker_build_image_elk:
   extends: .base_docker_images_except
   only:

sbin/tag_and_push_docker_image.sh

@@ -115,7 +115,7 @@ if [ ! -z "${1+x}" ] && [ "${1}" == "pull" ]; then
       # Set, splits tuple into $1 and $2. this shadows previous variables
     # shellcheck disable=SC2086
     set -- $image
-    local_url="${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/${1}"
+    local_url="${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/${2}"
     # Pull images, at least one of the two images must succeed
     echo "docker pull ${local_url}:${tag}"
     docker pull "${local_url}:${tag}" || docker pull "${local_url}:latest" || exit 1