@@ -153,11 +153,12 @@ verdicts as described above.
153153 > `https://github.com/canonical/oci-factory/actions/runs/<run-id>/attempts/<n>#summary-<summary-id>`
154154
155155- Findings are addressed in the `ignored-vulnerabilities:` field of the image
156- trigger. Every new or modified entry must have an explanatory comment that:
157- identifies the affected package/source and ecosystem, and states the
158- maintainer's actual risk disposition with an image-specific reason the
159- finding may be ignored. Existing untouched entries do not need to be updated
160- solely to meet this comment format.
156+ trigger. Every new or modified vulnerability entry must identify the affected
157+ package/source and ecosystem; entries for other Trivy finding types must
158+ instead identify the affected file/component and rule category. Every entry
159+ must state the maintainer's actual risk disposition with an image-specific
160+ reason the finding may be ignored. Existing untouched entries do not need to
161+ be updated solely to meet this comment format.
161162
162163 A package name, description, CVSS score, Ubuntu priority, or status such as
163164 `Needs evaluation` is useful supporting context, but is not by itself a risk
@@ -190,15 +191,17 @@ verdicts as described above.
190191
191192- The `.trivyignore` file is **deprecated**. Do not accept new `.trivyignore`
192193 files. When migrating an affected build to `ignored-vulnerabilities`, require
193- every still-applicable rule to move, not only the changed rules. Once
194- `ignored-vulnerabilities` is present, that build no longer uses
195- `.trivyignore`. The legacy file may remain temporarily because previously
196- released revisions can still depend on it.
194+ every still-applicable rule to move, not only the changed rules. A non-empty
195+ `ignored-vulnerabilities` list takes precedence over `.trivyignore`; an empty
196+ or omitted list still falls back to the legacy file. The legacy file may
197+ remain temporarily because previously released revisions can still depend on
198+ it.
197199 Example wording:
198200
199- > Let's move every still-applicable rule to `ignored-vulnerabilities`; once
200- > present, that build no longer uses `.trivyignore`. The legacy file may
201- > remain for previously released revisions that still depend on it.
201+ > Let's move every still-applicable rule to `ignored-vulnerabilities`; a
202+ > non-empty list takes precedence over `.trivyignore`, while an empty or
203+ > omitted list still falls back to the legacy file. The file may remain for
204+ > previously released revisions that still depend on it.
202205
203206- `ignored-vulnerabilities` requires a `version: 2` trigger. A `version: 1`
204207 trigger may stay as-is only until it needs this field; then it MUST switch to
0 commit comments