Skip to content
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

version: add RootlessKit, slirp4netns, and VPNKit version #42330

Merged
merged 1 commit into from
Mar 22, 2022
Merged

version: add RootlessKit, slirp4netns, and VPNKit version #42330

merged 1 commit into from
Mar 22, 2022

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Apr 27, 2021 •
edited
Loading

- What I did
Add RootlesKit info to the Version API.

- How to verify it

$ docker --context=rootless version
Client:
 Version:           unknown-version
 API version:       1.41
 Go version:        go1.16.3
 Git commit:        unknown-commit
 Built:             unknown-buildtime
 OS/Arch:           linux/amd64
 Context:           rootless
 Experimental:      true

Server:
 Engine:
  Version:          library-import
  API version:      1.41 (minimum version 1.12)
  Go version:       go1.16.3
  Git commit:       library-import
  Built:            library-import
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          v1.5.0
  GitCommit:        8c906ff108ac28da23f69cc7b74f8e7a470d1df0
 runc:
  Version:          1.0.0-rc93+dev
  GitCommit:        c73d766ee6e1a24517545b0a71fe78d5f78d0449
 docker-init:
  Version:          0.19.0
  GitCommit:        de40ad0
 rootlesskit:
  Version:          0.14.2
  ApiVersion:       1.1.1
  NetworkDriver:    slirp4netns
  PortDriver:       builtin
  StateDir:         /tmp/rootlesskit158605632
 slirp4netns:
  Version:          1.1.9
  GitCommit:        4e37ea557562e0d7a64dc636eff156f64927335e

- Description for the changelog

version: add RootlessKit, slirp4netns, and VPNKit version

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

@AkihiroSuda AkihiroSuda added kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. area/rootless Rootless mode labels Apr 27, 2021
@AkihiroSuda AkihiroSuda added this to the 21.xx milestone Apr 27, 2021
AkihiroSuda
AkihiroSuda commented Apr 27, 2021
View reviewed changes
api/types/types.go Outdated Show resolved Hide resolved
@AkihiroSuda AkihiroSuda force-pushed the rootlesskit-info branch 2 times, most recently from 0dfc553 to a2dec68 Compare April 28, 2021 07:31
thaJeztah
thaJeztah requested changes Apr 30, 2021
View reviewed changes
Copy link
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.

left some thoughts

rootless/rootless.go Outdated Show resolved Hide resolved
rootless/rootless.go Outdated Show resolved Hide resolved
api/types/types.go Outdated Show resolved Hide resolved
@AkihiroSuda AkihiroSuda changed the title info: add RootlessKit info (+ bump API version to v1.42) version: add RootlessKit, slirp4netns, and VPNKit version May 4, 2021
@AkihiroSuda AkihiroSuda requested a review from thaJeztah May 4, 2021 13:38
@AkihiroSuda
Copy link
Member Author

@thaJeztah PTAL

thaJeztah
thaJeztah approved these changes Jun 3, 2021
View reviewed changes
Copy link
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

the only thing I'm starting to wonder is if we should have some option to switch between "verbose" and "less verbose" on the CLI (to not print all the components, or only basic information) WDYT?

daemon/info_unix.go
}

func (daemon *Daemon) fillRootlessVersion(v *types.Version) {
if !rootless.RunningWithRootlessKit() {
Copy link
Member

Choose a reason for hiding this comment

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

Do you think we should use a sync.Once for these? (probably ok for a follow-up)

Copy link
Member Author

Choose a reason for hiding this comment

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

RunningWithRootlessKit already has sync.Once:

moby/rootless/rootless.go

Line 20 in 33c332a

runningWithRootlessKitOnce.Do(func() {

Calling the RootlessKit API should not be Once.

@AkihiroSuda
Copy link
Member Author

the only thing I'm starting to wonder is if we should have some option to switch between "verbose" and "less verbose" on the CLI (to not print all the components, or only basic information) WDYT?

SGTM

@tianon
Copy link
Member

tianon commented Jun 4, 2021

the only thing I'm starting to wonder is if we should have some option to switch between "verbose" and "less verbose" on the CLI (to not print all the components, or only basic information) WDYT?

+1 - having docker version print the full version of several dependent (but separate) components instead of just client/server versions by default is strange IMO 😅

@AkihiroSuda
Copy link
Member Author

@tianon Does this PR LGTY? 🙏

@AkihiroSuda
Copy link
Member Author

rebased

@AkihiroSuda
Copy link
Member Author

rebased again

@AkihiroSuda AkihiroSuda force-pushed the rootlesskit-info branch 2 times, most recently from 4d7d9bd to 74026db Compare September 14, 2021 07:34
@AkihiroSuda
Copy link
Member Author

rebased

@AkihiroSuda
Copy link
Member Author

rebased

@AkihiroSuda AkihiroSuda force-pushed the rootlesskit-info branch 2 times, most recently from 46faeb8 to 64f4526 Compare February 6, 2022 10:49
@AkihiroSuda
Copy link
Member Author

rebased 😞

@AkihiroSuda
Copy link
Member Author

rebased

@AkihiroSuda
Copy link
Member Author

@thaJeztah @tonistiigi Can we merge this?

cpuguy83
cpuguy83 approved these changes Mar 12, 2022
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Member

Sorry, looks like there's some conflicts again.

@AkihiroSuda
version: add RootlessKit, slirp4netns, and VPNKit version
de6732a 
```console
$ docker --context=rootless version
...
Server:
...
 rootlesskit:
  Version:          0.14.2
  ApiVersion:       1.1.1
  NetworkDriver:    slirp4netns
  PortDriver:       builtin
  StateDir:         /tmp/rootlesskit245426514
 slirp4netns:
  Version:          1.1.9
  GitCommit:        4e37ea557562e0d7a64dc636eff156f64927335e
```

Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda
Copy link
Member Author

rebased

@cpuguy83 cpuguy83 merged commit 6b9b445 into moby:master Mar 22, 2022
@thaJeztah thaJeztah mentioned this pull request Mar 25, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

Assignees
No one assigned
Labels
area/api area/rootless Rootless mode impact/changelog kind/enhancement Enhancements are not bugs or new features but can improve usability or performance.
Projects
None yet
Milestone
23.0.0
Development

Successfully merging this pull request may close these issues.
5 participants
@AkihiroSuda @tianon @cpuguy83 @tonistiigi @thaJeztah