From 79f97374002d73cfc7199c045146807df65e3c41 Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Tue, 3 May 2022 10:40:48 +0200 Subject: [PATCH] feat(IaC-Docker-Compose) update to new version of Docker Compose --- templates/IaC/docker-compose.gitlab-ci.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index 40df723..81fa8e7 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -1,5 +1,5 @@ .docker-compose-deploy: - image: docker/compose:alpine-1.29.1 + image: docker:20.10.14-alpine3.15 stage: deploy variables: SCP_DESTINATION: "" @@ -9,7 +9,7 @@ SSH_USER: "" DOCKER_REGISTRY: "$CI_REGISTRY" ENV_SETUP_FILE: "setup_env.sh" - SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY + SSH_PRIVATE_KEY_DEPLOY: $SSH_PRIVATE_KEY rules: - when: manual # https://docs.gitlab.com/ee/ci/ssh_keys/ @@ -23,12 +23,18 @@ # Add keys to known hosts for Docker Compose - ssh-keyscan $SSH_URL >> ~/.ssh/known_hosts - if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi + #Install docker Compose, from release directly + - wget https://github.com/docker/compose/releases/download/v2.4.1/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose + - chmod +x /usr/local/bin/docker-compose script: - 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 docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans .docker-compose-validate: - image: docker/compose:alpine-1.29.1 + image: docker:20.10.14-alpine3.15 stage: verify + before_script: + - curl -SL https://github.com/docker/compose/releases/download/v2.4.1/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose + - chmod +x /usr/local/bin/docker-compose script: - docker-compose $COMPOSE_EXTRA_ARGS config