Skip to content

chore(deps): update ca-certificates docker dep (backport #2424) #2461

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

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2024

Description

Closes: #XXXX


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • tackled an existing issue or discussed with a team member
  • left instructions on how to review the changes
  • targeted the correct branch (see PR Targeting)

Reviewers Checklist

All items are required.
Please add a note if the item is not applicable
and please add your handle next to the items reviewed
if you only reviewed selected items.

I have...

  • added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • confirmed all author checklist items have been addressed
  • confirmed that this PR does not change production code
  • reviewed content
  • tested instructions (if applicable)
  • confirmed all CI checks have passed

This is an automatic backport of pull request #2424 done by [Mergify](https://mergify.com).

chore(deps): update docker dep

(cherry picked from commit 2ba4587)

# Conflicts:
#	Dockerfile
@mergify mergify bot requested a review from a team as a code owner April 5, 2024 15:56
@mergify mergify bot requested review from Vvaradinov and ramacarlucho April 5, 2024 15:56
@mergify mergify bot added the conflicts label Apr 5, 2024
Copy link
Contributor Author

mergify bot commented Apr 5, 2024

Cherry-pick of 2ba4587 has failed:

On branch mergify/bp/release/v16.0.x/pr-2424
Your branch is up to date with 'origin/release/v16.0.x'.

You are currently cherry-picking commit 2ba45879.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@0xstepit 0xstepit closed this Apr 5, 2024
@mergify mergify bot deleted the mergify/bp/release/v16.0.x/pr-2424 branch April 5, 2024 16:24
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.

3 participants