Skip to content

rootless: optional support for lxc-user-nic SUID binary#39112

Merged
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:lxc-user-nic
Apr 25, 2019
Merged

rootless: optional support for lxc-user-nic SUID binary#39112
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:lxc-user-nic

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Apr 19, 2019

Signed-off-by: Akihiro Suda akihiro.suda.cz@hco.ntt.co.jp

- What I did

Added support for lxc-user-nic.
lxc-user-nic can eliminate slirp overhead but needs /etc/lxc/lxc-usernet to be configured for the current user.

To use lxc-user-nic, $DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic also needs to be set.

- How I did it

By updating RootlessKit from v0.3.0 to v0.4.0:
rootless-containers/rootlesskit@70e0502...e92d5e7

- How to verify it

$ cat /etc/lxc/lxc-usernet
# USERNAME TYPE BRIDGE COUNT
penguin    veth lxcbr0 1
$ DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic contrib/dockerd-rootless.sh --experimental

- Description for the changelog

rootless: optional support for lxc-user-nic SUID binary

- A picture of a cute animal (not mandatory but encouraged)
🐧

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 19, 2019

Codecov Report

Merging #39112 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #39112      +/-   ##
==========================================
- Coverage   37.05%   37.05%   -0.01%     
==========================================
  Files         612      612              
  Lines       45400    45400              
==========================================
- Hits        16824    16822       -2     
- Misses      26294    26297       +3     
+ Partials     2282     2281       -1

@AkihiroSuda
Copy link
Copy Markdown
Member Author

cc @tonistiigi @tiborvass

@AkihiroSuda
Copy link
Copy Markdown
Member Author

@tiborvass @cpuguy83 @thaJeztah PTAL?

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM, but left a suggestion

Comment thread contrib/dockerd-rootless.sh Outdated
lxc-user-nic can eliminate slirp overhead but needs /etc/lxc/lxc-usernet to be configured for the current user.

To use lxc-user-nic, $DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic also needs to be set.

This commit also bumps up RootlessKit from v0.3.0 to v0.4.0:
rootless-containers/rootlesskit@70e0502...e92d5e7

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for updating!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants