Commit eb641b01 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/trivy-clean-subcommand' into 'master' 

fix(variant): trivy 0.53.0 added the clean subcommand for semantic cache management

Closes #60

See merge request to-be-continuous/maven!86
parents b04a77f9 6333e64e

templates/gitlab-ci-maven-jib.yml

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ mvn-trivy: 
    TRIVY_CACHE_DIR: ".trivycache/"

  script: |

    # cache cleanup is needed when scanning images with the same tags, it does not remove the database

    trivy image --clear-cache

    trivy clean --scan-cache || trivy image --clear-cache

    export TRIVY_USERNAME=${MAVEN_JIB_REGISTRY_SNAPSHOT_USER:-${MAVEN_JIB_REGISTRY_USER:-$CI_REGISTRY_USER}}

    export TRIVY_PASSWORD=${MAVEN_JIB_REGISTRY_SNAPSHOT_PASSWORD:-${MAVEN_JIB_REGISTRY_PASSWORD:-$CI_REGISTRY_PASSWORD}}

    export basename=$(echo "${MAVEN_JIB_SNAPSHOT_IMAGE}" | sed 's|[/:]|_|g')