Merge branch 'renovate/aquasecurity-trivy-0.x' into 'master'
chore(deps): update dependency aquasecurity/trivy to v0.23.0 See merge request gilden/ci/gitlab-ci-templates!48
This commit is contained in:
commit
8f11e8c35d
@ -2,7 +2,7 @@
|
||||
image: $MAVEN_IMAGE
|
||||
stage: test
|
||||
variables:
|
||||
TRIVY_VERSION: 0.22.0
|
||||
TRIVY_VERSION: 0.23.0
|
||||
EXITCODE: 1
|
||||
TRIVY_EXTRA_ARGS: "--no-progress --ignore-unfixed"
|
||||
before_script:
|
||||
@ -10,8 +10,8 @@
|
||||
- tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
|
||||
script:
|
||||
- mvn $MAVEN_CLI_OPTS compile jib:buildTar -DskipTests
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input target/jib-image.tar
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input target/jib-image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code 0 --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input target/jib-image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --severity HIGH,CRITICAL --input target/jib-image.tar
|
||||
cache:
|
||||
paths:
|
||||
- .trivycache/
|
||||
@ -23,7 +23,7 @@
|
||||
image: $GRADLE_IMAGE
|
||||
stage: test
|
||||
variables:
|
||||
TRIVY_VERSION: 0.22.0
|
||||
TRIVY_VERSION: 0.23.0
|
||||
EXITCODE: 1
|
||||
PROJECT_DIR: $CI_PROJECT_DIR/build
|
||||
TRIVY_EXTRA_ARGS: "--no-progress --ignore-unfixed"
|
||||
@ -33,8 +33,8 @@
|
||||
- tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
|
||||
script:
|
||||
- ./gradlew jibBuildTar -DskipTests
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input $PROJECT_DIR/jib-image.tar
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input $PROJECT_DIR/jib-image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code 0 --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input $PROJECT_DIR/jib-image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --severity HIGH,CRITICAL --input $PROJECT_DIR/jib-image.tar
|
||||
cache:
|
||||
paths:
|
||||
- .trivycache/
|
||||
@ -48,7 +48,7 @@
|
||||
name: gcr.io/kaniko-project/executor:debug
|
||||
entrypoint: [ "" ]
|
||||
variables:
|
||||
TRIVY_VERSION: 0.22.0
|
||||
TRIVY_VERSION: 0.23.0
|
||||
PROJECT_DIR: $CI_PROJECT_DIR
|
||||
DOCKERFILE_LOCATION: $CI_PROJECT_DIR/Dockerfile
|
||||
CONTEXT_LOCATION: $CI_PROJECT_DIR
|
||||
@ -59,8 +59,8 @@
|
||||
- tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
|
||||
script:
|
||||
- /kaniko/executor --context $CONTEXT_LOCATION --dockerfile $DOCKERFILE_LOCATION --cache-dir cache/image --tarPath image.tar --no-push --destination image --skip-tls-verify
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input image.tar
|
||||
- ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --input image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code 0 --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input image.tar
|
||||
- ./trivy --cache-dir .trivycache/ image --timeout 15m $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --severity HIGH,CRITICAL --input image.tar
|
||||
cache:
|
||||
paths:
|
||||
- .trivycache/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user