Pass noDNS and isPluginV2 flags to plugin

- "noDNS" controls whether upon ContainerStarted event a container
  should be registered within the Weave DNS.
- "isPluginV2" will be used to determine a path to host's /proc.
This commit is contained in:
Martynas Pumputis authored and Bryan Boreham committed 2017-04-12 13:05:40 +00:00
1 parent 332762201a
commit 01bfa602ad
5 files changed
+35 -25

No files matched your search

+5 -3
View File
@@ -154,6 +154,7 @@ func main() {
pluginSocket string
pluginMeshSocket string
enablePlugin bool
enablePluginV2 bool
defaultDockerHost = "unix:///var/run/docker.sock"
)
@@ -199,7 +200,8 @@ func main() {
mflag.StringVar(&token, []string{"-token"}, "", "token for peer discovery")
mflag.StringVar(&advertiseAddress, []string{"-advertise-address"}, "", "address to advertise for peer discovery")
mflag.BoolVar(&enablePlugin, []string{"-plugin"}, false, "enable Docker plugin")
mflag.BoolVar(&enablePlugin, []string{"-plugin"}, false, "enable Docker plugin (v1)")
mflag.BoolVar(&enablePluginV2, []string{"-plugin-v2"}, false, "enable Docker plugin (v2)")
mflag.StringVar(&pluginSocket, []string{"-plugin-socket"}, "/run/docker/plugins/weave.sock", "plugin socket on which to listen")
mflag.StringVar(&pluginMeshSocket, []string{"-plugin-mesh-socket"}, "/run/docker/plugins/weavemesh.sock", "plugin socket on which to listen in mesh mode")
@@ -404,8 +406,8 @@ func main() {
go listenAndServeHTTP(statusAddr, statusMux)
}
if enablePlugin {
go plugin.Start(httpAddr, dockerCli, pluginSocket, pluginMeshSocket)
if enablePlugin || enablePluginV2 {
go plugin.Start(httpAddr, dockerCli, pluginSocket, pluginMeshSocket, noDNS, enablePluginV2)
}
signals.SignalHandlerLoop(common.Log, router)