diff --git a/.env.example b/.env.example index fd9d5e1be1a3c38ea9322178dbff90d623e788d6..88f7fe0fd19ef60c0ff3e211b621b68e458f750a 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 31df1c796915311da52458167d827944bdc82fb7..997ae61d81898afff387ff5e0bbce1512b661f87 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