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.

Sign up for GitHub

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

Jump to bottom

moby-engine & moby-cli: upgrade version 20.10.27 -> 24.0.9 #8556

Merged
merged 10 commits into from
Apr 24, 2024
Merged

moby-engine & moby-cli: upgrade version 20.10.27 -> 24.0.9 #8556

merged 10 commits into from
Apr 24, 2024

Conversation

mfrw
Copy link
Member

@mfrw mfrw commented Mar 26, 2024 •
edited
Loading

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

What does the PR accomplish, why was it needed?

  • moby-engine: upgrade version 20.10.27 -> 24.0.9
  • moby-cli: upgrade version 20.10.27 -> 24.0.9
Change Log

moby-cli:

  • Drop un-needed patches
  • Add vendor tarball for new deps in make manpages

moby-engine:

  • Drop un-needed patches
  • Backport CVEs patch
  • Remove docker-proxy as it's no longer used (2050e085f95bb796e9ff3a325b9985e319c193cf)
  • Add the in-tree version of docker proxy built from cmd/docker-proxy into /usr/libexec
  • Set userland-proxy-path explicitly by introducing /etc/docker/daemon.json
Does this affect the toolchain?

NO

Associated issues
Links to CVEs
  • NA
Test Methodology

  • Local Build & Test in a VM ✅

  • BuddyBuild:
    - PR-8556 ✅
    - Post Rebase / Address Review: PR-8556 ✅

  • Full Build link

  • AKS tests [validating]

  • Local tests [validating]

@microsoft-github-policy-service microsoft-github-policy-service bot added the main PR Destined for main label Mar 26, 2024
@mfrw mfrw marked this pull request as ready for review March 26, 2024 13:58
@mfrw mfrw requested review from a team as code owners March 26, 2024 13:58
@mfrw mfrw force-pushed the mfrw/bump-moby-24.0.9 branch from e03ce93 to ab3312e Compare March 27, 2024 06:00
@mfrw mfrw mentioned this pull request Mar 27, 2024
Closed
12 tasks
@mfrw mfrw force-pushed the mfrw/bump-moby-24.0.9 branch from ab3312e to 88458a7 Compare April 12, 2024 06:20
@mfrw mfrw requested a review from hbeberman April 16, 2024 04:06
@mfrw mfrw force-pushed the mfrw/bump-moby-24.0.9 branch from 88458a7 to 5ac28ac Compare April 16, 2024 04:08
mfrw added 10 commits April 23, 2024 18:55
@mfrw
moby-engine: upgrade version 20.10.27 -> 24.0.9
cc74b72 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-engine: backport CVEs
ab40fe2 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-engine: cleanup spec to adapt to v24.X
c1fb03a 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-engine: drop un-needed patches
fb37cea 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-engine: cgmanifest: update entry
4688a41 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-cli: upgrade version 20.10.27 -> 24.0.9
c784933 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-cli: drop un-needed patches
650de59 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-cli: add patch to build vendored manpages
37c8aad 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-cli: cgmanifest: update entry
2297920 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw
moby-engine: add appaarmor as we still use it 2.0
ed8467d 
Signed-off-by: Muhammad Falak R Wani <[email protected]>
@mfrw mfrw force-pushed the mfrw/bump-moby-24.0.9 branch from 5ac28ac to ed8467d Compare April 23, 2024 13:26
@mfrw mfrw merged commit 40a1be4 into main Apr 24, 2024
10 checks passed
@mfrw mfrw deleted the mfrw/bump-moby-24.0.9 branch April 24, 2024 17:18
@paulmey paulmey mentioned this pull request Apr 30, 2024
Closed
amritakohli pushed a commit that referenced this pull request May 2, 2024
@mfrw @amritakohli
moby-engine & moby-cli: upgrade version 20.10.27 -> 24.0.9 (#8556)
96c6c4f 
Changelog: https://github.com/moby/moby/releases/tag/v24.0.0
Signed-off-by: Muhammad Falak R Wani <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hbeberman hbeberman hbeberman approved these changes

Assignees
No one assigned
Labels
main PR Destined for main
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mfrw @hbeberman