Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflict using manual trivy and the trivy action #752

Merged
merged 2 commits into from
Oct 19, 2024

Conversation

addyess
Copy link
Contributor

@addyess addyess commented Oct 18, 2024

Overview

Resolve a conflict trying to run trivy manually and using the trivy-action

Details

The trivy-action clones itself into a directory called trivy overwriting the binary just downloaded in that same spot.
By moving the downloaded file to another directory, they don't' conflict

@addyess addyess requested a review from a team as a code owner October 18, 2024 21:04
@addyess addyess force-pushed the akd/fix-trivy-scanning-on-snap branch from 0b28dee to 382af16 Compare October 18, 2024 21:24
@addyess addyess force-pushed the akd/fix-trivy-scanning-on-snap branch from 382af16 to fc62a65 Compare October 18, 2024 21:25
Copy link
Contributor

@bschimke95 bschimke95 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for fixing this annoying thing

@bschimke95 bschimke95 merged commit f21e2a9 into main Oct 19, 2024
19 of 20 checks passed
@bschimke95 bschimke95 deleted the akd/fix-trivy-scanning-on-snap branch October 19, 2024 06:24
evilnick pushed a commit to evilnick/k8s-snap that referenced this pull request Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants