Skip to content

vendor: github.com/docker/docker v23.0.0#3117

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:update_engine
Mar 2, 2023
Merged

vendor: github.com/docker/docker v23.0.0#3117
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:update_engine

Conversation

@thaJeztah
Copy link
Member

  • client: improve error messaging on crash

full diff: moby/moby@v23.0.0-rc.3...v23.0.0

- Description for the changelog

@thaJeztah
Copy link
Member Author

@dperny @neersighted ptal

@crazy-max
Copy link
Member

@thaJeztah
Copy link
Member Author

👍 rebased

(oh! probably need to remove some config to remove CircleCI - or do we need a dummy CircleCI config in master if we still need it in the bump_20.10 branch?)

@crazy-max
Copy link
Member

Yes we need to remove the GitHub App and associated webhooks in repo settings. Don't think we need a dummy CircleCI workflow as we don't have any branches that require CircleCI atm.

@neersighted
Copy link
Member

We might still need the bump_20.10 branch. Can we backport GHA there?

@crazy-max
Copy link
Member

crazy-max commented Feb 9, 2023

We might still need the bump_20.10 branch. Can we backport GHA there?

Oh didn't recall about this branch (sorry @thaJeztah, overlooked your comment). Backporting GHA would be not that trivial I think. It might make sense to keep a dummy CircleCI config on default branch in the meantime.

- client: improve error messaging on crash

full diff: moby/moby@v23.0.0-rc.3...v23.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

@neersighted @dperny this one should be ready for review now (CI is now green with the CircleCI fix)

Also opened a follow-up (larger diff due to GinkGo update in that one, so kept it separate for now); #3124

@thaJeztah
Copy link
Member Author

Thanks! I'll bring this one in, and rebase the other one

@thaJeztah thaJeztah merged commit 80a528a into moby:master Mar 2, 2023
@thaJeztah thaJeztah deleted the update_engine branch March 2, 2023 16:34
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