Skip to content

Add logdrivers to /info#32540

Merged
mlaventure merged 1 commit intomoby:masterfrom
cpuguy83:add_logdrivers_to_info
Apr 26, 2017
Merged

Add logdrivers to /info#32540
mlaventure merged 1 commit intomoby:masterfrom
cpuguy83:add_logdrivers_to_info

Conversation

@cpuguy83
Copy link
Member

This is required for swarmkit to be able to filter based on log driver.

download-1

@aaronlehmann
Copy link

daemon/logger/factory.go:38:1: exported function ListDrivers should have comment or be unexported

This is required for swarmkit to be able to filter based on log driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@anusha-ragunathan
Copy link
Contributor

anusha-ragunathan commented Apr 11, 2017

Adding pluginv2 drivers to docker info is not necessary. Swarmkit should query docker plugin ls and look for type LogDriver for scheduling decisions. This is how its done for volumes and networks. https://github.com/docker/swarmkit/blob/4dbc0a367de19b9f0dfb64302cd9fd28b5909b66/agent/exec/dockerapi/executor.go#L54

@cpuguy83
Copy link
Member Author

cpuguy83 commented Apr 12, 2017

@anusha-ragunathan V2 drivers are not registered in the logger package, only with the plugingetter. So /info only ends up returning built-ins and v1.

EDIT:
Actually we only do v2 plugins for logs, so only built-ins end up on /info.

@anusha-ragunathan
Copy link
Contributor

LGTM

@dnephin dnephin modified the milestones: 17.05.0, 17.06 Apr 25, 2017
@dnephin
Copy link
Member

dnephin commented Apr 25, 2017

I moved this to 17.06. I assume it's not making 17.05, right ?

Copy link
Member

@dnephin dnephin 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 Author

Yep

@mlaventure mlaventure merged commit e8abe0a into moby:master Apr 26, 2017
@thaJeztah
Copy link
Member

@cpuguy83 looks like this needs an update to the swagger file?

@thaJeztah
Copy link
Member

and API changelog

@mlaventure
Copy link
Contributor

Oups. Should probably teach Gordon how to detect those 😅 👼

@cpuguy83 cpuguy83 deleted the add_logdrivers_to_info branch May 1, 2017 15:04
@cpuguy83 cpuguy83 restored the add_logdrivers_to_info branch May 1, 2017 16:01
@cpuguy83 cpuguy83 deleted the add_logdrivers_to_info branch September 20, 2017 16:54
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.

7 participants