From 49df029b03647109ee348eadb93ef19dfc7baad3 Mon Sep 17 00:00:00 2001
From: Marcel Feix <marcel.feix@exxcellent.de>
Date: Mon, 16 May 2022 14:03:20 +0000
Subject: [PATCH] fix(Docker-Compose) Set Socket in export and execute on that

---
 templates/IaC/docker-compose.gitlab-ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml
index 59e6b02..ac05951 100644
--- a/templates/IaC/docker-compose.gitlab-ci.yml
+++ b/templates/IaC/docker-compose.gitlab-ci.yml
@@ -28,19 +28,22 @@
     - 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:
+    - export DOCKER_HOST=ssh://$SSH_USER@$SSH_URL:$SSH_PORT
     - 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
+    - if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login  $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
+    - docker-compose pull
+    - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
 
 .broken-ssh-connection-workaround:
   script:
+    - export DOCKER_HOST=unix:///tmp/docker.sock
     - if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION"  ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi
     # 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
+    - docker-compose pull 
+    - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
 
 #todo add docker compose renovate updater
 .docker-compose-validate: