paul/gilde-ci-cd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(IaC-Docker-Compose) change workaround because anchors are not usable from include

Browse Source
This commit is contained in:
Marcel Feix 2022-05-10 10:24:18 +02:00
parent e70980a2fb
commit 757dbde199
No known key found for this signature in database
GPG Key ID: 04D016E104A25F03
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
documentation/chapters/templates/IaC/docker-compose.adoc
View File

@ -34,6 +34,16 @@ echo COMPOSE_PROJECT_NAME=project-prefix >>.env
echo SOME_PASSWORD="$SOME_PASSWORD" >>.env
----
== SSH Problem workaround
Sometimes there is a problem with some SSH servers and Docker.
We have a workaround for this, please override your script with the following:
----
script:
- !reference [.broken-ssh-connection-workaround, script]
----
.Variables
|===

13
templates/IaC/docker-compose.gitlab-ci.yml
View File

@ -31,12 +31,13 @@
- if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION" ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi
- DOCKER_HOST=ssh://$SSH_USER@$SSH_URL:$SSH_PORT docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
.broken-ssh-connection-workaround: &broken-ssh-connection-workaround
- 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
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
.broken-ssh-connection-workaround:
script:
- 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
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
.docker-compose-validate: