From c4d5b2245d788f87080ca8b5e449bc49cef266d1 Mon Sep 17 00:00:00 2001
From: Sebastian Miller <smiller@7bulls.com>
Date: Mon, 11 Jul 2022 12:40:20 +0200
Subject: [PATCH] [CI] Changed two variable names to more convenient ones
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7cc34c..6f9e8c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,11 @@ variables:
DOCKER_IMAGE: "docker:20.10.14"
DOCKER_DIND_IMAGE: "${DOCKER_IMAGE}-dind"
- WP: wp3
- COMPONENT_NAME: icg
+ COMPONENT_WP: wp3
+ COMPONENT_IMAGE_NAME: icg
- TMP_IMAGE: ${CI_REGISTRY_HOST}/temp/${COMPONENT_NAME}:${CI_PIPELINE_ID}
- TARGET_IMAGE: ${CI_REGISTRY_HOST}/${WP}/${COMPONENT_NAME}:${CI_COMMIT_BRANCH}
+ TMP_IMAGE: ${CI_REGISTRY_HOST}/temp/${COMPONENT_IMAGE_NAME}:${CI_PIPELINE_ID}
+ TARGET_IMAGE: ${CI_REGISTRY_HOST}/${COMPONENT_WP}/${COMPONENT_IMAGE_NAME}:${CI_COMMIT_BRANCH}
stages:
# - quality TODO
@@ -77,7 +77,7 @@ security-trivy-icg:
services:
- name: $DOCKER_DIND_IMAGE
variables:
- REPORT_FILENAME: ${COMPONENT_NAME}-container-scanning-report.json
+ REPORT_FILENAME: ${COMPONENT_IMAGE_NAME}-container-scanning-report.json
before_script:
- *artifactory-login
- export TRIVY_VERSION=$(wget -qO - "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
--
GitLab