Skip to content

Add support for trivy dbRepository and javaDBRepository#1857

Merged
wy65701436 merged 1 commit intogoharbor:mainfrom
benji78:trivy-db-repository
Sep 3, 2025
Merged

Add support for trivy dbRepository and javaDBRepository#1857
wy65701436 merged 1 commit intogoharbor:mainfrom
benji78:trivy-db-repository

Conversation

@benji78
Copy link
Copy Markdown
Contributor

@benji78 benji78 commented Nov 11, 2024

This adds support for custom trivy dbRepository and javaDBRepository which was made possible through SCANNER_TRIVY_DB_REPOSITORY and SCANNER_TRIVY_JAVA_DB_REPOSITORY environment variables added in goharbor/harbor-scanner-trivy/pull/3.

Closes #1821

@benji78 benji78 force-pushed the trivy-db-repository branch from 8d0b19c to e0582ef Compare November 11, 2024 16:59
Vad1mo
Vad1mo previously requested changes Nov 11, 2024
Copy link
Copy Markdown
Member

@Vad1mo Vad1mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you point me to the upstream Trviy documentation?

I can't find anything related to SCANNER_TRIVY_DB_REPOSITORY in trivy.

@benji78
Copy link
Copy Markdown
Contributor Author

benji78 commented Nov 12, 2024

Here is the documentation for --db-repository and --java-db-repository. I added the environment variables in harbor-scanner-trivy through the mentioned pull request.

@benji78 benji78 marked this pull request as draft November 17, 2024 17:37
@benji78
Copy link
Copy Markdown
Contributor Author

benji78 commented Nov 17, 2024

I will add support for multiple database repositories and mark the pull request as ready along with goharbor/harbor-scanner-trivy#7 as soon as trivy has decided which repositories to put as default.

@MinerYang MinerYang self-assigned this Nov 18, 2024
@benji78 benji78 force-pushed the trivy-db-repository branch from 9513f87 to 9625b00 Compare November 18, 2024 10:05
@benji78 benji78 marked this pull request as ready for review November 20, 2024 17:41
@benji78 benji78 force-pushed the trivy-db-repository branch from 9625b00 to 7b460f1 Compare November 20, 2024 18:56
@github-actions
Copy link
Copy Markdown

This PR is being marked stale due to a period of inactivty. If this PR is still relevant, please comment or remove the stale label. Otherwise, this PR will close in 30 days.

@github-actions
Copy link
Copy Markdown

This PR is being marked stale due to a period of inactivty. If this PR is still relevant, please comment or remove the stale label. Otherwise, this PR will close in 30 days.

@github-actions github-actions bot added the Stale label May 31, 2025
@LeclerT
Copy link
Copy Markdown

LeclerT commented Jun 3, 2025

+1
Where is the progress of this feature ? Thanks in advance

@MinerYang MinerYang force-pushed the trivy-db-repository branch 2 times, most recently from c9de3e8 to 63e13f8 Compare September 1, 2025 07:01
Copy link
Copy Markdown
Collaborator

@MinerYang MinerYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

feat: support multiple db repositories

Signed-off-by: Benjamin Bordes <benjaminbordes78@gmail.com>

fix template error && add unittest for trivy db repository

Signed-off-by: my036811 <miner.yang@broadcom.com>
Copy link
Copy Markdown
Contributor

@wy65701436 wy65701436 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@wy65701436 wy65701436 dismissed Vad1mo’s stale review September 3, 2025 07:41

it's good to go

@wy65701436 wy65701436 merged commit 916ad42 into goharbor:main Sep 3, 2025
9 checks passed
@MinerYang
Copy link
Copy Markdown
Collaborator

Hi @benji78,

Thanks for contributing to harbor-helm, and this new feature would delivered along with harbor-helm v1.18.0(app version v2.14.0).

Best,
Miner

alexlebens pushed a commit to alexlebens/infrastructure that referenced this pull request Sep 20, 2025
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [harbor](https://goharbor.io) ([source](https://github.com/goharbor/harbor-helm)) | minor | `1.17.2` -> `1.18.0` |

---

### Release Notes

<details>
<summary>goharbor/harbor-helm (harbor)</summary>

### [`v1.18.0`](https://github.com/goharbor/harbor-helm/releases/tag/v1.18.0)

[Compare Source](goharbor/harbor-helm@v1.17.2...v1.18.0)

<!-- Release notes generated using configuration in .github/release.yml at 1.18.0 -->

Harbor OSS version: v2.14.0

#### What's Changed

##### Other Changes

- Fix: fix bug where log level configuration was not applied by [@&#8203;sisilia91](https://github.com/sisilia91) in [#&#8203;2167](goharbor/harbor-helm#2167)
- Added existingSecretAdminPassword to the values.yaml file by [@&#8203;rkthtrifork](https://github.com/rkthtrifork) in [#&#8203;2180](goharbor/harbor-helm#2180)
- add proxy timeout for nginx https config by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2202](goharbor/harbor-helm#2202)
- update adapter list for replication and proxy-cache by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2223](goharbor/harbor-helm#2223)
- Fix ArgoCD sync by [@&#8203;drewhemm](https://github.com/drewhemm) in [#&#8203;2173](goharbor/harbor-helm#2173)
- feat(gw-api): add support for HTTPRoutes by [@&#8203;larivierec](https://github.com/larivierec) in [#&#8203;2175](goharbor/harbor-helm#2175)
- feat: Added support for configuring dual-stack services ([#&#8203;2212](goharbor/harbor-helm#2212)) by [@&#8203;reasonerjt](https://github.com/reasonerjt) in [#&#8203;2226](goharbor/harbor-helm#2226)
- Add support for trivy dbRepository and javaDBRepository by [@&#8203;benji78](https://github.com/benji78) in [#&#8203;1857](goharbor/harbor-helm#1857)
- fix redis existingSecret with username url rendering by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2231](goharbor/harbor-helm#2231)
- \[Cherry-pick]Move extraEnvVars and add tests by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2236](goharbor/harbor-helm#2236)
- \[cherry-pick]bump k8s version matrix ([#&#8203;2238](goharbor/harbor-helm#2238)) by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2239](goharbor/harbor-helm#2239)
- Bump version to 1.14.0, appVersion to 2.14.0 by [@&#8203;MinerYang](https://github.com/MinerYang) in [#&#8203;2242](goharbor/harbor-helm#2242)

#### New Contributors

- [@&#8203;sisilia91](https://github.com/sisilia91) made their first contribution in [#&#8203;2167](goharbor/harbor-helm#2167)
- [@&#8203;rkthtrifork](https://github.com/rkthtrifork) made their first contribution in [#&#8203;2180](goharbor/harbor-helm#2180)
- [@&#8203;drewhemm](https://github.com/drewhemm) made their first contribution in [#&#8203;2173](goharbor/harbor-helm#2173)
- [@&#8203;larivierec](https://github.com/larivierec) made their first contribution in [#&#8203;2175](goharbor/harbor-helm#2175)
- [@&#8203;benji78](https://github.com/benji78) made their first contribution in [#&#8203;1857](goharbor/harbor-helm#1857)

**Full Changelog**: <goharbor/harbor-helm@v1.17.0...v1.18.0>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMTYuNiIsInVwZGF0ZWRJblZlciI6IjQxLjExNi42IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJjaGFydCJdfQ==-->

Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/1509
Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net>
Co-committed-by: Renovate Bot <renovate-bot@alexlebens.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make Trivy's dbRepository and javaDbRepository configurable

6 participants