From 41aa1a438956871e9e00efa509d1cde2f243f3ad Mon Sep 17 00:00:00 2001
From: Joost Hemmen <joost.hemmen@ufz.de>
Date: Wed, 29 Jan 2025 09:36:44 +0100
Subject: [PATCH] Update 2 files
- /.gitlab/ci/cve-scan.gitlab-ci.yml
- /.gitlab/ci/common.gitlab-ci.yml
---
.gitlab/ci/common.gitlab-ci.yml | 5 +++--
.gitlab/ci/cve-scan.gitlab-ci.yml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab/ci/common.gitlab-ci.yml b/.gitlab/ci/common.gitlab-ci.yml
index e377a67e..600ee3e4 100644
--- a/.gitlab/ci/common.gitlab-ci.yml
+++ b/.gitlab/ci/common.gitlab-ci.yml
@@ -19,8 +19,9 @@ variables:
MINIO_FTP_PORT: 40021
MINIO_FTP_PASV_PORTS: 30000-30010:30000-30010
CADVISOR_PORT: 8080
- DOCKER_IMAGE_TAG: 24-cli
- DOCKER_SERVICE_IMAGE_TAG: 24-dind
+ DOCKER_IMAGE_TAG: 27-cli
+ DOCKER_SERVICE_IMAGE_TAG: 27-dind
+ TRIVY_VERSION: 0.58.2
services:
- "docker:${DOCKER_SERVICE_IMAGE_TAG}"
diff --git a/.gitlab/ci/cve-scan.gitlab-ci.yml b/.gitlab/ci/cve-scan.gitlab-ci.yml
index b07484bc..b61cf1da 100644
--- a/.gitlab/ci/cve-scan.gitlab-ci.yml
+++ b/.gitlab/ci/cve-scan.gitlab-ci.yml
@@ -7,7 +7,7 @@ docker-image-scan:
before_script:
# Install Trivy in the pipeline environment
- "apk add --no-cache curl"
- - "curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.58.2"
+ - "curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v${TRIVY_VERSION}"
- "cp .env.example .env"
script:
- "docker compose pull -q"
--
GitLab