docs: fix Trivy links (changed domain) (cdd42166) · Commits · to be continuous... / Docker

README.md

+7 −7

Original line number	Diff line number	Diff line
		@@ -450,9 +450,9 @@ In case your image takes quite some time to be downloaded by the runner, increas

		### `docker-trivy` job

		This job performs a Vulnerability Static Analysis with [Trivy](https://aquasecurity.github.io/trivy) on your built image.
		This job performs a Vulnerability Static Analysis with [Trivy](https://trivy.dev) on your built image.

		Without any configuration Trivy will run in [standalone](https://aquasecurity.github.io/trivy/latest/docs/references/modes/standalone/) mode.
		Without any configuration Trivy will run in [standalone](https://trivy.dev/docs/latest/references/modes/standalone/) mode.

		If you want to run Trivy in client/server mode, you need to set the `TRIVY_SERVER` environment variable.

		@@ -467,9 +467,9 @@ It is bound to the `package-test` stage, and uses the following variables:
		\| -------------------------------------------------------------------------- \| ---------------------------------------------------------------------------------------------------------------------- \| ------------------------------------------------------------------- \|
		\| `trivy-image` / `DOCKER_TRIVY_IMAGE` \| The docker image used to scan images with Trivy \| `docker.io/aquasec/trivy:latest`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_TRIVY_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_TRIVY_IMAGE)\|
		\| `trivy-disabled` / `DOCKER_TRIVY_DISABLED` \| Set to `true` to disable Trivy analysis \| _(none)_ \|
		\| `trivy-args` / `DOCKER_TRIVY_ARGS` \| Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options) \| `--ignore-unfixed --pkg-types os --exit-on-eol 1 --detection-priority comprehensive --disable-telemetry --skip-version-check` \|
		\| `trivy-args` / `DOCKER_TRIVY_ARGS` \| Additional [`trivy image` options](https://trivy.dev/docs/latest/references/configuration/cli/trivy_image/#options) \| `--ignore-unfixed --pkg-types os --exit-on-eol 1 --detection-priority comprehensive --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`)
		@@ -477,15 +477,15 @@ Examples:
		* `TRIVY_DB_REPOSITORY`: OCI repository to retrieve Trivy Database from
		* `TRIVY_JAVA_DB_REPOSITORY`: OCI repository to retrieve Trivy Java Database from

		It's possible to ignore some CVE by adding a `.trivyignore` file at the root of the project (see [official documentation](https://trivy.dev/latest/docs/configuration/filtering/#trivyignore) for syntax).
		It's possible to ignore some CVE by adding a `.trivyignore` file at the root of the project (see [official documentation](https://trivy.dev/docs/latest/configuration/filtering/#trivyignore) for syntax).

		In addition to a textual report in the console, this job produces the following reports, kept for one day and only available for download by users with the Developer role or higher:

		\| Report \| Format \| Usage \|
		\| ----------------------------------------- \| ----------------------------------------------------------------------------------------------------------------------------------------- \| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- \|
		\| `reports/docker-trivy-*.native.json` \| Native Trivy report format (json) \| [DefectDojo integration](https://docs.defectdojo.com/en/connecting_your_tools/parsers/file/trivy/)<br/>_This report is generated only if DefectDojo template is detected_ \|
		\| `reports/docker-trivy-*.gitlab.json` \| [Trivy report format for GitLab Container Security](https://aquasecurity.github.io/trivy/latest/tutorials/integrations/gitlab-ci/) format \| [GitLab Container Security](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscontainer_scanning) \|
		\| `reports/docker-trivy-*.gitlab-codequality.json` \| [Trivy report format for GitLab Code Quality](https://aquasecurity.github.io/trivy/latest/tutorials/integrations/gitlab-ci/) format \| [GitLab Code Quality](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscodequality) \|
		\| `reports/docker-trivy-*.gitlab.json` \| [Trivy report format for GitLab Container Security](https://trivy.dev/docs/latest/tutorials/integrations/gitlab-ci/) format \| [GitLab Container Security](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscontainer_scanning) \|
		\| `reports/docker-trivy-*.gitlab-codequality.json` \| [Trivy report format for GitLab Code Quality](https://trivy.dev/docs/latest/tutorials/integrations/gitlab-ci/) format \| [GitLab Code Quality](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscodequality) \|

		### `docker-sbom` job

kicker.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@
		{
		"id": "trivy",
		"name": "Trivy",
		"description": "[Trivy](https://aquasecurity.github.io/trivy) vulnerability analysis",
		"description": "[Trivy](https://trivy.dev) vulnerability analysis",
		"disable_with": "DOCKER_TRIVY_DISABLED",
		"variables": [
		{
		@@ -185,7 +185,7 @@
		},
		{
		"name": "DOCKER_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 --exit-on-eol 1 --detection-priority comprehensive --disable-telemetry --skip-version-check",
		"advanced": true
		}

templates/gitlab-ci-docker.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -161,7 +161,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 --exit-on-eol 1 --detection-priority comprehensive --disable-telemetry --skip-version-check
		sbom-disabled:
		description: Disable Software Bill of Materials
		@@ -1308,7 +1308,7 @@ docker-trivy:
		basename=$(echo "${DOCKER_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 ${DOCKER_TRIVY_ARGS} --exit-code 1 --format json --output reports/docker-trivy-${basename}.native.json $DOCKER_SNAPSHOT_IMAGE \|\| exit_code=$?