paul/gilde-ci-cd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(IaC-Docker-Compose): Update execution Image.

Browse Source 
Add Docker Compose Version to Renovate config
This commit is contained in:
Marcel Feix 2022-05-13 12:19:24 +02:00
parent bf99a5374c
commit 8829767c77
No known key found for this signature in database
GPG Key ID: 04D016E104A25F03
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
renovate.json
View File

@ -27,6 +27,17 @@
"depNameTemplate": "aquasecurity/trivy", "depNameTemplate": "aquasecurity/trivy",
"datasourceTemplate": "github-releases", "datasourceTemplate": "github-releases",
"extractVersionTemplate": "^v(?<version>.*)$" "extractVersionTemplate": "^v(?<version>.*)$"
},
{
"fileMatch": [
"docker-compose.gitlab-ci.yml$"
],
"matchStrings": [
"DOCKER_COMPOSE_VERSION: (?<currentValue>.*)\\s"
],
"depNameTemplate": "docker/compose",
"datasourceTemplate": "github-releases",
"extractVersionTemplate": "^v(?<version>.*)$"
} }
] ]
} }

9
templates/IaC/docker-compose.gitlab-ci.yml
View File

@ -1,7 +1,8 @@
.docker-compose-deploy: .docker-compose-deploy:
image: docker:20.10.14-alpine3.15 image: docker:20.10.16-alpine3.15
stage: deploy stage: deploy
variables: variables:
DOCKER_COMPOSE_VERSION: v2.5.0
SCP_DESTINATION: "" SCP_DESTINATION: ""
SCP_SOURCE: $CI_PROJECT_DIR SCP_SOURCE: $CI_PROJECT_DIR
COMPOSE_EXTRA_ARGS: "" COMPOSE_EXTRA_ARGS: ""
@ -25,7 +26,7 @@
- ssh-keyscan $SSH_URL >> ~/.ssh/known_hosts - 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 - 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 #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 - chmod +x /usr/local/bin/docker-compose
script: script:
- if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION" ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi - 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 #todo add docker compose renovate updater
.docker-compose-validate: .docker-compose-validate:
image: docker:20.10.14-alpine3.15 image: docker:20.10.16-alpine3.15
stage: verify stage: verify
before_script: before_script:
#Install docker Compose, from release directly #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 - chmod +x /usr/local/bin/docker-compose
script: script:
- docker-compose $COMPOSE_EXTRA_ARGS config - docker-compose $COMPOSE_EXTRA_ARGS config