Commit 1d375f52 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '419-job-checking-hub-images-exceed-github-rates' into 'latest' 

Resolve "Job checking hub images exceed github rates"

Closes #419

See merge request r2devops/hub!251
parents 2a5d96a2 47da2538

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -134,14 +134,14 @@ job_image_scan: 
    - mkdir ${OUTPUT_DIR}

  script:

    # We force database download once so we don't do much GitHub Api calls

    - ./trivy image --download-db-only --template "@${TEMPLATE_NAME}"

    - ./trivy --cache-dir ${TRIVY_CACHE_DIR} image --download-db-only

    - for JOB in $(ls -A jobs); do

    -   IMAGE=$(pipenv run python3 tools/job_image/job_image.py ${JOB})

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

    -     NAME=$(basename ${IMAGE})

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

    -     ./trivy --skip-update --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}" --cache-dir ${TRIVY_CACHE_DIR} --exit-code 1 --severity ${TRIVY_EXIT_ON_SEVERITY} -o ${OUTPUT_DIR}/${NAME}-failed-${TRIVY_OUTPUT} ${IMAGE}

    -       ./trivy --skip-update --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=""