Move docker-init to /usr/libexec/docker/ #80
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmengelbert
reviewed
Jul 28, 2023
Starting with docker v24 dockerd will lookup docker-init in more than just $PATH, including /usr/libexec/docker/*. Moving it here is both more "correct" in terms of linux userspace layout, but also gets us away from needing to mark moby-engine < 24 as conflicting.
This was not handling the nested `linux_<arch>` for tests so the tests were always running against whatever was in the package repo. Now if its in bundles it will use those packages.
pmengelbert
added a commit
that referenced
this pull request
Aug 2, 2023
PR #80 changed the `moby-tini` package such that the `docker-init` binary will be installed to `/usr/libexec/docker/docker-init`. Therefore, it no longer conflicts with the `/usr/bin/docker-init` installed by the `moby-engine` package prior to version 24. Signed-off-by: Peter Engelbert <pmengelbert@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Starting with docker v24 dockerd will lookup docker-init in more than just $PATH, including /usr/libexec/docker/*.
Moving it here is both more "correct" in terms of linux userspace layout, but also gets us away from needing to mark moby-engine < 24 as conflicting.