From 8e52a0ad682a644c32f4b9db2073a3b1e67b8206 Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Mon, 23 May 2022 13:50:41 +0200 Subject: [PATCH] chore(IaC Docker-Compose): Add COMPOSE_UP_EXTRA_ARGS --- templates/IaC/docker-compose.gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index e1a355c..3b134c8 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -6,6 +6,7 @@ SCP_DESTINATION: "" SCP_SOURCE: $CI_PROJECT_DIR COMPOSE_EXTRA_ARGS: "" + COMPOSE_UP_EXTRA_ARGS: "" SSH_URL: "" SSH_USER: "" SSH_PORT: "22" @@ -32,7 +33,7 @@ - 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 $COMPOSE_EXTRA_ARGS pull - - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans + - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans $COMPOSE_UP_EXTRA_ARGS .broken-ssh-connection-workaround: script: @@ -43,7 +44,7 @@ - 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 $COMPOSE_EXTRA_ARGS pull - - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans + - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans $COMPOSE_UP_EXTRA_ARGS #todo add docker compose renovate updater .docker-compose-validate: