Commit 4b8cdeea authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '360-optimize-job_image_scan-job' into 'latest' 

Resolve "Optimize job_image_scan  job"

Closes #360

See merge request r2devops/hub!208
parents 435a5d12 8e9e92bc

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ job_image_scan: 
    -   IMAGE=$(pipenv run python3 tools/job_image/job_image.py ${JOB})

    -   if [ ! -z ${IMAGE} ]; then

    -     NAME=$(basename ${IMAGE})

    -     ./trivy --template "@${TEMPLATE_NAME}" -o ${OUTPUT_DIR}/${NAME}.${TRIVY_OUTPUT} ${IMAGE}

    -     ./trivy --template "@${TEMPLATE_NAME}" --cache-dir ${TRIVY_CACHE_DIR} -o ${OUTPUT_DIR}/${NAME}.${TRIVY_OUTPUT} ${IMAGE}

    -     if [ ! -z ${TRIVY_EXIT_ON_SEVERITY} ]; then

    -       ./trivy --template "@${TEMPLATE_NAME}" --exit-code 1 --severity ${TRIVY_EXIT_ON_SEVERITY} -o ${OUTPUT_DIR}/${NAME}-failed-${TRIVY_OUTPUT} ${IMAGE}

    -       ./trivy --template "@${TEMPLATE_NAME}" --cache-dir ${TRIVY_CACHE_DIR} --exit-code 1 --severity ${TRIVY_EXIT_ON_SEVERITY} -o ${OUTPUT_DIR}/${NAME}-failed-${TRIVY_OUTPUT} ${IMAGE}

    -     fi

    -   fi

    -   IMAGE=""