From a069a8c96ff28048ad812e900f51228ce91e6fd0 Mon Sep 17 00:00:00 2001
From: Joost Hemmen <joost.hemmen@ufz.de>
Date: Thu, 30 Jan 2025 15:30:58 +0100
Subject: [PATCH] use grafana latest image, retry only executing job on main
---
.env.example | 2 +-
.gitlab/ci/cve-scan.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.env.example b/.env.example
index fd9d5e1b..88f7fe0f 100644
--- a/.env.example
+++ b/.env.example
@@ -129,7 +129,7 @@ MINIO_FTP_PASV_PORTS=127.0.0.1:30000-30010:30000-30010
############################################################
# visualization (grafana)
############################################################
-GRAFANA_IMAGE_TAG=10.4.15
+GRAFANA_IMAGE_TAG=latest
GRAFANA_USER=grafana
GRAFANA_PASSWORD=grafana
GRAFANA_URL=http://visualization:3000
diff --git a/.gitlab/ci/cve-scan.gitlab-ci.yml b/.gitlab/ci/cve-scan.gitlab-ci.yml
index 31df1c79..997ae61d 100644
--- a/.gitlab/ci/cve-scan.gitlab-ci.yml
+++ b/.gitlab/ci/cve-scan.gitlab-ci.yml
@@ -24,7 +24,7 @@ docker-image-scan:
paths:
- "*.cve"
expire_in: 30 days
- only:
- - "main"
+ rules:
+ - if: $CI_COMMIT_REF_SLUG == $CI_DEFAULT_BRANCH
tags:
- "dind"
\ No newline at end of file
--
GitLab