L2SS-559: Change final job and reset elk docker changes for test

.gitlab-ci.yml

@@ -43,6 +43,9 @@ stages:
 #    - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh
 # This suffers from only refs changes not working as expected:
 # https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55012
+# Therefore we have to add `only: refs: - merge_requests` to all jobs that are
+# only supposed to run on merge requests with file changes. However,
+# two pipelines will spawn instead of one of which one tagged with 'detached`.
 .base_docker_images_except:
   extends: .base_docker_images
   except:
@@ -63,6 +66,8 @@ docker_store_images_master_tag:
 docker_store_images_changes:
   extends: .base_docker_store_images
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/.env
   except:

docker-compose/elk/Dockerfile

 FROM sebp/elk
 
 # Give more time for ElasticSearch to startup on our poor dev laptops
-ENV ES_CONNECT_RETRY=90
+ENV ES_CONNECT_RETRY=60
 
 # Provide our logstash config
 ADD logstash /etc/logstash/