Skip to content
This repository has been archived by the owner on Nov 23, 2019. It is now read-only.

Add "SecurityOptions" in Info. #157

Merged
merged 1 commit into from Mar 25, 2016
Merged

Add "SecurityOptions" in Info. #157

merged 1 commit into from Mar 25, 2016

Conversation

yongtang
Copy link
Contributor

This PR tries to add SecurityOptions field in Info so that security options such as apparmor, seccomp, or selinux could be displayed by docker info.

Detailed discussion could be found in:
moby/moby#20909
moby/moby#21172

cc @justincormack @calavera @thaJeztah

Signed-off-by: Yong Tang yong.tang.github@outlook.com

@@ -243,6 +243,7 @@ type Info struct {
ServerVersion string
ClusterStore string
ClusterAdvertise string
SecurityOptions string
Copy link
Member

Choose a reason for hiding this comment

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

should we make this a []string? I think that'd be better for the API (and similar to, e.g. how we have a list of installed plugins;

engine-api/types/types.go

Lines 248 to 257 in 0ec73ff

// PluginsInfo is a temp struct holding Plugins name
// registered with docker daemon. It is used by Info struct
type PluginsInfo struct {
// List of Volume plugins registered
Volume []string
// List of Network plugins registered
Network []string
// List of Authorization plugins registered
Authorization []string
}
)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@thaJeztah Yes []string is definitely better than a space separated string and easy to process. Let me update the pull request. Thanks!

This PR tries to add SecurityOptions field in Info so that
security options such as apparmor, seccomp, or selinux could
be displayed by `docker info`.

Detailed discussion could be found in:
moby/moby#20909
moby/moby#21172

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@yongtang
Copy link
Contributor Author

@thaJeztah Just updated the pull request to change to []string. Let me know if there are any other issues.

@calavera
Copy link
Contributor

LGTM

1 similar comment
@thaJeztah
Copy link
Member

LGTM

@calavera
Copy link
Contributor

Please, do not merge this PR yet. We're waiting for a release cut in docker/docker before moving this forward.

@calavera
Copy link
Contributor

We already have a tag a frozen branches for both projects. Merging this in 🎉

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants