From c3555e325794dcd5b58f3699980cde6da7df5e6d Mon Sep 17 00:00:00 2001 From: Clement Bois <clement.bois@orange.com> Date: Thu, 7 Dec 2023 13:54:34 +0100 Subject: [PATCH] fix(sbom): syft catalogers renamed --- README.md | 2 +- kicker.json | 2 +- templates/gitlab-ci-docker.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bf7a147..a03c7c5 100644 --- a/README.md +++ b/README.md @@ -398,7 +398,7 @@ It is bound to the `package-test` stage, and uses the following variables: | --------------------- | -------------------------------------- | ----------------- | | `DOCKER_SBOM_DISABLED` | Set to `true` to disable this job | _none_ | | `DOCKER_SBOM_IMAGE` | The docker image used to emit SBOM | `registry.hub.docker.com/anchore/syft:debug` | -| `DOCKER_SBOM_OPTS` | Options for syft used for SBOM analysis | `--catalogers rpm-db-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger,portage-cataloger` | +| `DOCKER_SBOM_OPTS` | Options for syft used for SBOM analysis | `--catalogers rpm-db-cataloger,alpm-db-cataloger,apk-db-cataloger,dpkg-db-cataloger,portage-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger` | ### `docker-publish` job diff --git a/kicker.json b/kicker.json index e9e2226..ca9976a 100644 --- a/kicker.json +++ b/kicker.json @@ -210,7 +210,7 @@ { "name": "DOCKER_SBOM_OPTS", "description": "Options for syft used for SBOM analysis", - "default": "--catalogers rpm-db-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger,portage-cataloger", + "default": "--catalogers rpm-db-cataloger,alpm-db-cataloger,apk-db-cataloger,dpkg-db-cataloger,portage-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger", "advanced": true } ] diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 50f2dc8..ae79f97 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -86,7 +86,7 @@ variables: # SBOM genenration image and arguments DOCKER_SBOM_IMAGE: "registry.hub.docker.com/anchore/syft:debug" - DOCKER_SBOM_OPTS: "--catalogers rpm-db-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger,portage-cataloger" + DOCKER_SBOM_OPTS: "--catalogers rpm-db-cataloger,alpm-db-cataloger,apk-db-cataloger,dpkg-db-cataloger,portage-cataloger,alpmdb-cataloger,apkdb-cataloger,dpkgdb-cataloger" # default: one-click publish DOCKER_PROD_PUBLISH_STRATEGY: manual -- GitLab