From 34a168940a3db9c6c21f178e612664a59764c22d Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Mon, 30 May 2022 09:37:26 +0200 Subject: [PATCH] docs(Docker Compose): Add missing Compose Version --- templates/IaC/docker-compose.gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index 3b134c8..f6595c4 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -32,7 +32,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 $COMPOSE_EXTRA_ARGS pull + - docker-compose $COMPOSE_EXTRA_ARGS pull - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans $COMPOSE_UP_EXTRA_ARGS .broken-ssh-connection-workaround: @@ -43,13 +43,15 @@ - 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 $COMPOSE_EXTRA_ARGS pull + - docker-compose $COMPOSE_EXTRA_ARGS pull - docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans $COMPOSE_UP_EXTRA_ARGS #todo add docker compose renovate updater .docker-compose-validate: image: docker:20.10.16-alpine3.15 stage: verify + variables: + DOCKER_COMPOSE_VERSION: v2.5.1 before_script: #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