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

docs: fix Trivy links (changed domain)

parent 2ee2ad75

README.md

+2 −2
Original line number Diff line number Diff line
@@ -539,9 +539,9 @@ The template uses GitLab registries and authentication defaults. See the Docker 
| `sbom-image` / `MAVEN_SBOM_IMAGE` | The image used to perform and complete the Security Bill of Materials | `docker.io/anchore/syft:debug` |

| `sbom-opts` / `MAVEN_SBOM_OPTS` | SBOM options to complete the Security Bill of Materials  | `--override-default-catalogers rpm-db-cataloger,alpm-db-cataloger,apk-db-cataloger,dpkg-db-cataloger,portage-cataloger,nix-store-cataloger,java`          |

| `trivy-image` / `MAVEN_TRIVY_IMAGE` | The image to perform container security scanning  | `docker.io/aquasec/trivy:latest` |

| `trivy-args` / `MAVEN_TRIVY_ARGS` | Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options) | `--ignore-unfixed --pkg-types os --disable-telemetry --skip-version-check` |

| `trivy-args` / `MAVEN_TRIVY_ARGS` | Additional [`trivy image` options](https://trivy.dev/docs/latest/references/configuration/cli/trivy_image/#options) | `--ignore-unfixed --pkg-types os --disable-telemetry --skip-version-check` |



Other Trivy parameters shall be configured using [Trivy environment variables](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options).

Other Trivy parameters shall be configured using [Trivy environment variables](https://trivy.dev/docs/latest/references/configuration/cli/trivy_image/#options).

Examples:



* `TRIVY_SEVERITY`: severities of security issues to be displayed (comma separated values: `UNKNOWN`, `LOW`, `MEDIUM`, `HIGH`, `CRITICAL`)

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ 
        {

          "id": "mvn-trivy",

          "name": "Maven Trivy",

          "description": "[Trivy](https://aquasecurity.github.io/trivy) vulnerability analysis",

          "description": "[Trivy](https://trivy.dev) vulnerability analysis",

          "disable_with": "MAVEN_TRIVY_DISABLED",

          "variables": [

            {
@@ -248,7 +248,7 @@ 
            },

            {

              "name": "MAVEN_TRIVY_ARGS",

              "description": "Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options)",

              "description": "Additional [`trivy image` options](https://trivy.dev/docs/latest/references/configuration/cli/trivy_image/#options)",

              "default": "--ignore-unfixed --pkg-types os --disable-telemetry --skip-version-check",

              "advanced": true

            }

templates/gitlab-ci-maven-jib.yml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ spec: 
      description: The docker image used to scan images with Trivy

      default: docker.io/aquasec/trivy:latest

    trivy-args:

      description: Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options)

      description: Additional [`trivy image` options](https://trivy.dev/docs/latest/references/configuration/cli/trivy_image/#options)

      default: --ignore-unfixed --pkg-types os --disable-telemetry --skip-version-check

    sbom-image:

      default: docker.io/anchore/syft:debug
@@ -150,7 +150,7 @@ mvn-trivy: 
    export basename=$(echo "${MAVEN_JIB_SNAPSHOT_IMAGE}" | sed 's|[/:]|_|g')

    mkdir -p ./reports

    if [[ -z "$TRIVY_SERVER" ]]; then

      log_warn "\\e[93mYou are using Trivy in standalone mode. To get faster scans, consider setting the TRIVY_SERVER variable to the address of a Trivy server. More info here: https://aquasecurity.github.io/trivy/latest/docs/references/modes/client-server/\\e[0m"

      log_warn "\\e[93mYou are using Trivy in standalone mode. To get faster scans, consider setting the TRIVY_SERVER variable to the address of a Trivy server. More info here: https://trivy.dev/docs/latest/references/modes/client-server/\\e[0m"

    fi

    # Generate the native JSON report that can later be converted to other formats

    trivy image --no-progress ${MAVEN_TRIVY_ARGS} --exit-code 1 --format json --output reports/jib-trivy-${basename}.native.json $MAVEN_JIB_SNAPSHOT_IMAGE || exit_code=$?