[v0.23 backport] executor/oci: remove dependency on github.com/docker/docker #6109
Conversation
This file contains hidden or 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
Add a fork of github.com/docker/docker/daemon/libnetwork/internal/resolvconf, taken at commit [254f64ded64027db0d2d1531a8ef9015de68e2f2]. I did not preserve git history for this one (just a copy), but history can be found in the Moby repository if needed. [254f64ded64027db0d2d1531a8ef9015de68e2f2]: moby/moby@254f64d Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 44a7014) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 504b10d) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Rewrite the resolvconf code to use libnetwork's internal packege, which allows us to skip some of the moby-specific handling (writing to a file, creating a hash of the file to detect changes made by the user (not supported by BuildKit, which always mounts read-only). This rewrite also allows us to skip GetNameservers, GetSearchDomains, GetOptions, and FilterResolvDNS, which repeatedly would parse the resolvconf file for each of them. The new code parses the original resolvconf once, after which mutations (overrides) are done in memory, after which we generate the resolv.conf to write to disk. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit b2d103f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit ce4e767) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 2614833) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 4e1e0fe) Signed-off-by: Sebastiaan van Stijn <[email protected]>
The moby/profiles/seccomp module was extracted from the Moby repository at commit [e1281f09fceec4aab518267c319a7bd4c79cf3c5][1]. [1]: moby/moby@e1281f0 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit db72534) Signed-off-by: Sebastiaan van Stijn <[email protected]>
github-actions
bot
added
area/testing
area/dependencies
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.
backport