Merge branch 'L2SS-1637-fix' into 'master'

L2SS-1637: Force local alpine

Closes L2SS-1637

See merge request !795

.gitlab-ci.yml

@@ -320,6 +320,10 @@ integration_test_docker:
   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 pull $tag
+    # re-tag alpine image from our registry to trick nomad in using it
+    - docker tag git.astron.nl:5000/lofar2.0/tango/alpine:latest alpine:latest
+    - docker pull git.astron.nl:5000/lofar2.0/tango/docker-registry-proxy:0.6.3
+    - docker tag git.astron.nl:5000/lofar2.0/tango/docker-registry-proxy:0.6.3 docker-registry-proxy:0.6.3
     #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs
 

docker-compose/object-storage.yml

@@ -11,7 +11,7 @@ version: '2.1'
 services:
   # the object storage is started by nomad/jumppad. This only populates the data for the integration tests
   init-object-storage:
-    image: minio/mc:${MINIO_CLIENT_VERSION}
+    image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/mc:${MINIO_CLIENT_VERSION}
     networks:
       - control
     dns: ${DNS}

infra/dev/nomad/nomad.hcl

@@ -97,6 +97,10 @@ resource "nomad_cluster" "station" {
     NO_PROXY = "git.astron.nl:5000"
   }
 
+  image {
+    name = "git.astron.nl:5000/lofar2.0/tango/nomad:1.6.1"
+  }
+
   volume {
     source      = "${variable.host_volume}"
     destination = "/localdata"

sbin/tag_and_push_docker_image.sh

@@ -78,8 +78,12 @@ REMOTE_IMAGES=(
   "levant latest hashicorp"
   "consul latest hashicorp"
   "minio ${MINIO_VERSION} minio"
+  "mc ${MINIO_CLIENT_VERSION} minio"
   "busybox latest"
   "bash latest"
+  "alpine latest"
+  "nomad 1.6.1 shipyardrun"
+  "docker-registry-proxy 0.6.3 shipyardrun"
 )
 
 # Triple tuple of docker-compose names, image names and if necessary for
@@ -99,6 +103,8 @@ LOCAL_IMAGES=(
   "jupyter-lab jupyter-lab n"
   "integration-test docker-compose_integration-test n"
   "tango-prometheus-exporter tango-prometheus-exporter n"
+
+  "alpine alpine y"
 )
 
 # LOCAL_IMAGES verifier, this has been going wrong a couple of times