From 7de4685db8421342beb331d92e5edc44e2738dbc Mon Sep 17 00:00:00 2001
From: Marcel Feix <marcel.feix@exxcellent.de>
Date: Mon, 16 May 2022 13:47:58 +0000
Subject: [PATCH] Update docker-compose.gitlab-ci.yml

---
 templates/IaC/docker-compose.gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml
index fd908d8..59e6b02 100644
--- a/templates/IaC/docker-compose.gitlab-ci.yml
+++ b/templates/IaC/docker-compose.gitlab-ci.yml
@@ -24,12 +24,12 @@
     - chmod 700 ~/.ssh
     # Add keys to known hosts for Docker Compose
     - ssh-keyscan $SSH_URL >> ~/.ssh/known_hosts
-    - if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
     #Install docker Compose, from release directly
     - wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose
     - chmod +x /usr/local/bin/docker-compose
   script:
     - if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION"  ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi
+    - if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
     - DOCKER_HOST=ssh://$SSH_USER@$SSH_URL:$SSH_PORT docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
 
 .broken-ssh-connection-workaround:
@@ -38,6 +38,7 @@
     # Tunnel Docker socket from remote Maschine to local Maschine. This should be more stable than the current SSH Implementation of Docker
     - rm -f /tmp/docker.sock
     - ssh -M -S docker-ctrl-socket -fnNT -L /tmp/docker.sock:/var/run/docker.sock "$SSH_USER@$SSH_URL" -p $SSH_PORT -o ControlPersist=no
+    - if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
     - DOCKER_HOST=unix:///tmp/docker.sock docker-compose pull 
     - DOCKER_HOST=unix:///tmp/docker.sock docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans