[28.x backport] dockerd-rootless.sh: if no slirp4netns, try pasta#51162
Merged
[28.x backport] dockerd-rootless.sh: if no slirp4netns, try pasta#51162
Conversation
Signed-off-by: Rob Murray <[email protected]> (cherry picked from commit 7e63d2a) Signed-off-by: Paweł Gronowski <[email protected]>
When DOCKERD_ROOTLESS_ROOTLESSKIT_MTU is not set, and ... - DOCKERD_ROOTLESS_ROOTLESSKIT_NET is not set and slirp4netns is selected, MTU defaults to 65520. - DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns, MTU defaults to 1500. Change the logic so that, however slirp4netns is selected, MTU defaults to 65520. Signed-off-by: Rob Murray <[email protected]> (cherry picked from commit a6206f2) Signed-off-by: Paweł Gronowski <[email protected]>
vvoland
added
status/2-code-review
kind/enhancement
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
- What I did
pastadriver detection #51143In the
dockerd-rootless.shscript, if there's noslirp4netnstrypastabefore falling back to VPNkit.When
pastais the network driver, the default port driver isimplicitinstead ofbuiltin.Also (second commit), if
slirp4netnsis selected by env-var, still set its default MTU to 65520.- How I did it
The notes at the top of the script say "Needs recent version of pasta (2023_12_04)" ... but I'm not sure how to check for that. The reported version number depends on the packager, and I don't know of a command line option to check for (like slirp4netns's check for `--netns-type). As it's no longer that new, perhaps a version check isn't essential ... but can add one if there's a way?
- How to verify it
On a Debian Trixie host, with moby 28.5.1, I tried ...
slirp4netnsinstalled, it was used as normaldockerd-rootless.sh-> ok (running with pasta)-p 8080:80and checked it workedDOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=builtin dockerd-rootless.sh-> errorDOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=implicit dockerd-rootless.sh-> ok- Human readable description for the release notes
- dockerd-rootless.sh: if slirp4netns is not installed, try using pasta (passt).