diff --git a/.gitlab/ci/common.gitlab-ci.yml b/.gitlab/ci/common.gitlab-ci.yml index e377a67e31b47ae18e473d5e3ca2044cddd8d353..600ee3e4d7f3063969b08c91fc37c36bddcfb423 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 b07484bc2c974c081c40b02286285e84ad637616..b61cf1dad3d59b91d0402ddfda243b93098e7dd2 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"