diff --git a/renovate.json b/renovate.json index 7154bb7..6a91c13 100644 --- a/renovate.json +++ b/renovate.json @@ -27,6 +27,17 @@ "depNameTemplate": "aquasecurity/trivy", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?.*)$" + }, + { + "fileMatch": [ + "docker-compose.gitlab-ci.yml$" + ], + "matchStrings": [ + "DOCKER_COMPOSE_VERSION: (?.*)\\s" + ], + "depNameTemplate": "docker/compose", + "datasourceTemplate": "github-releases", + "extractVersionTemplate": "^v(?.*)$" } ] } diff --git a/templates/IaC/docker-compose.gitlab-ci.yml b/templates/IaC/docker-compose.gitlab-ci.yml index 426d205..32ca29a 100644 --- a/templates/IaC/docker-compose.gitlab-ci.yml +++ b/templates/IaC/docker-compose.gitlab-ci.yml @@ -1,7 +1,8 @@ .docker-compose-deploy: - image: docker:20.10.14-alpine3.15 + image: docker:20.10.16-alpine3.15 stage: deploy variables: + DOCKER_COMPOSE_VERSION: v2.5.0 SCP_DESTINATION: "" SCP_SOURCE: $CI_PROJECT_DIR COMPOSE_EXTRA_ARGS: "" @@ -25,7 +26,7 @@ - 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.5.0/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose + - wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/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 @@ -41,11 +42,11 @@ #todo add docker compose renovate updater .docker-compose-validate: - image: docker:20.10.14-alpine3.15 + image: docker:20.10.16-alpine3.15 stage: verify before_script: #Install docker Compose, from release directly - - wget https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose + - wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/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