This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Conversation
evict
approved these changes
Jul 26, 2023
Contributor
Author
|
Before updating, running Trivy against sourcegraph/wolfiwolfi-server-base reported 9 vulns (8 medium, 1 high), and the grafana image reported several distinct vulns. After the update, both the sourcegraph/wolfi-server-base and wolfi-grafana images report 0 vulns using trivy. |
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-55310-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f0c6a207752f982eef2623f49d1c94b56679ed75
# Push it to GitHub
git push --set-upstream origin backport-55310-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1Then, create a pull request where the |
willdollman
added a commit
that referenced
this pull request
Jul 26, 2023
Update all base images to patch new vulnerabilities for the 5.1.5 release. - [x] Update base images - [x] Update grafana base images (updated separately) <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> - [x] CI (main-dry-run) https://buildkite.com/sourcegraph/sourcegraph/builds/236063 - [x] Manual vulnerability scanning of images (cherry picked from commit f0c6a20)
Contributor
Author
|
Backported manually in https://github.com/sourcegraph/sourcegraph/pull/55318 |
MaedahBatool
pushed a commit
that referenced
this pull request
Jul 28, 2023
Update all base images to patch new vulnerabilities for the 5.1.5 release. - [x] Update base images - [x] Update grafana base images (updated separately) ## Test plan <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> - [x] CI (main-dry-run) https://buildkite.com/sourcegraph/sourcegraph/builds/236063 - [x] Manual vulnerability scanning of images
davejrt
pushed a commit
that referenced
this pull request
Aug 9, 2023
Update all base images to patch new vulnerabilities for the 5.1.5 release. - [x] Update base images - [x] Update grafana base images (updated separately) ## Test plan <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> - [x] CI (main-dry-run) https://buildkite.com/sourcegraph/sourcegraph/builds/236063 - [x] Manual vulnerability scanning of images
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update all base images to patch new vulnerabilities for the 5.1.5 release.
Test plan