Update Alpine Image to 3.18.x#3046
Merged
joe-elliott merged 2 commits intografana:mainfrom Oct 20, 2023
Merged
Conversation
yvrhdn
approved these changes
Oct 20, 2023
Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net>
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3046-to-release-v2.2 origin/release-v2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b7f29566bc2414d2b975acd264dc0725820c735dWhen the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-3046-to-release-v2.2
# Create the PR body template
PR_BODY=$(gh pr view 3046 --json body --template 'Backport b7f29566bc2414d2b975acd264dc0725820c735d from #3046{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-v2.2] Update Alpine Image to 3.18.x" --body-file - --label "type/bug" --label "backport" --base release-v2.2 --milestone release-v2.2 --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-3046-to-release-v2.2
# Create a pull request where the `base` branch is `release-v2.2` and the `compare`/`head` branch is `backport-3046-to-release-v2.2`.
# Remove the local backport branch
git switch main
git branch -D backport-3046-to-release-v2.2 |
joe-elliott
added a commit
that referenced
this pull request
Oct 25, 2023
* fix 3044 Signed-off-by: Joe Elliott <number101010@gmail.com> * Update CHANGELOG.md Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net> --------- Signed-off-by: Joe Elliott <number101010@gmail.com> Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net> (cherry picked from commit b7f2956)
3 tasks
joe-elliott
added a commit
that referenced
this pull request
Oct 25, 2023
* fix 3044 Signed-off-by: Joe Elliott <number101010@gmail.com> * Update CHANGELOG.md Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net> --------- Signed-off-by: Joe Elliott <number101010@gmail.com> Co-authored-by: Koenraad Verheyden <koenraad.verheyden@posteo.net> (cherry picked from commit b7f2956)
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does:
Updates our base image to 3.18.x to patch CVE-2022-48174
Which issue(s) this PR fixes:
Update the Alpine image to fix 3.18 for Tempo. We will need to build a new release to fix GET.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]