8000 moby-engine: remove daemon.json with backported fix (#9551) by hbeberman · Pull Request #9851 · microsoft/azurelinux · GitHub
[go: up one dir, main page]
Skip to content

moby-engine: remove daemon.json with backported fix (#9551) #9851

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
Merged
merged 1 commit into from
Jul 16, 2024
Merged

moby-engine: remove daemon.json with backported fix (#9551) #9851

merged 1 commit into from
Jul 16, 2024

Conversation

hbeberman
Copy link
Member
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
  • If you are adding/removing a .spec file that has multiple-versions supported, please add @microsoft/cbl-mariner-multi-package-reviewers team as reviewer (Eg. golang has 2 versions 1.18, 1.21+)
  • Ready to merge
Summary

This is a cherry-pick of #9551 into fasttrack.

Our moby-engine-24.0.9-1 package brought in a new daemon.json file to inform the newer moby-engine version of docker-proxy's location. Adding daemon.json to the package regressed several use cases, instead we'll rely on backporting a recent upstream change (moby/moby#47804) that implicitly looks for docker-proxy in libexec so that we can drop daemon.json.

Change Log
Does this affect the toolchain?

NO

Associated issues
Test Methodology
  • Local package build
  • Buddy build: succeeded
  • Package upgrade on a running system. Verified that moby-engine is able to find docker-proxy after the upgrade.

@hbeberman hbeberman requested a review from a team as a code owner July 16, 2024 17:30
@PawelWMS
Copy link
Contributor

Failing ptests unrelated to this change - no regressions, ready to merge.

Sorry, something went wrong.

@PawelWMS PawelWMS merged commit 77d3928 into fasttrack/2.0 Jul 16, 2024
@PawelWMS PawelWMS deleted the hbeberman/fasttrack/moby-engine-backport branch July 16, 2024 19:55
@CBL-Mariner-Bot
Copy link
Collaborator

Auto cherry-pick results:

  • main ✅ -> Skipped

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=606378&view=results

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jslobodzian jslobodzian jslobodzian approved these changes

@PawelWMS PawelWMS PawelWMS approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hbeberman @PawelWMS @CBL-Mariner-Bot @jslobodzian
0