From 639006e1c8c9d7c0764ffc7726b84660fb04691b Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Mon, 16 May 2022 14:12:46 +0000 Subject: [PATCH] fix(Docker-compose) Add Extra Args to docker compose --- templates/IaC/docker-compose.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index ac05951..cb73ec6 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -31,7 +31,7 @@ - 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-compose pull + - docker-compose $COMPOSE_EXTRA_ARGS pull - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans .broken-ssh-connection-workaround: @@ -42,7 +42,7 @@ - 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-compose pull + - docker-compose $COMPOSE_EXTRA_ARGS pull - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans #todo add docker compose renovate updater