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

Update alpine version to 3.18.7 #3364

Merged
merged 1 commit into from
Jun 21, 2024

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Jun 19, 2024

Fixes #3355

Not quite released yet 😢

@simonswine simonswine added type/bug Something isn't working backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch labels Jun 19, 2024
@simonswine simonswine marked this pull request as ready for review June 19, 2024 11:17
@simonswine simonswine requested a review from a team as a code owner June 19, 2024 11:17
Copy link
Contributor

Hello @simonswine!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@simonswine simonswine added type/bug Something isn't working and removed type/bug Something isn't working missing-labels labels Jun 19, 2024
Copy link
Collaborator

@korniltsev korniltsev left a comment

Choose a reason for hiding this comment

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

image

@simonswine simonswine enabled auto-merge (squash) June 21, 2024 07:16
@simonswine simonswine merged commit b9a114e into grafana:main Jun 21, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 21, 2024
Fixes #3355

(cherry picked from commit b9a114e)
Copy link
Contributor

The backport to release/v1.6 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3364-to-release/v1.6 origin/release/v1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b9a114eede35c0c22214dd314f2858a033d85c82

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3364-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3364 --json body --template 'Backport b9a114eede35c0c22214dd314f2858a033d85c82 from #3364{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] Update alpine version to 3.18.7' --body-file - --label 'type/bug' --label 'backport' --base release/v1.6 --milestone release/v1.6 --web

Or, 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-3364-to-release/v1.6

# Create a pull request where the `base` branch is `release/v1.6` and the `compare`/`head` branch is `backport-3364-to-release/v1.6`.

# Remove the local backport branch
git switch main
git branch -D backport-3364-to-release/v1.6

simonswine added a commit that referenced this pull request Jun 21, 2024
Fixes #3355

(cherry picked from commit b9a114e)

Co-authored-by: Christian Simon <simon@swine.de>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch backport-failed type/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CVE-2023-6992 zlib, CVE-2023-42366 busybox
2 participants