Reuse docker client instance in plugin

Instead of creating a new one, reuse one created in weaver.

The change removes the pinning of client API versions (1.21 in our
case).
This commit is contained in:
Martynas Pumputis authored and Bryan Boreham committed 2017-04-12 13:05:40 +00:00
1 parent 568290afb7
commit 332762201a
3 files changed
+5 -21

No files matched your search

+2 -1
View File
@@ -47,7 +47,8 @@ if [ -z "$IPALLOC_INIT" ]; then
fi
exec /home/weave/weaver $EXTRA_ARGS --port=6783 $BRIDGE_OPTIONS \
--http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR --docker-api='' --no-dns \
--http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR \
--no-dns \
--ipalloc-range=$IPALLOC_RANGE \
--ipalloc-init $IPALLOC_INIT \
--nickname "$(hostname)" \
+1 -1
View File
@@ -405,7 +405,7 @@ func main() {
}
if enablePlugin {
go plugin.Start(httpAddr, dockerAPI, pluginSocket, pluginMeshSocket)
go plugin.Start(httpAddr, dockerCli, pluginSocket, pluginMeshSocket)
}
signals.SignalHandlerLoop(common.Log, router)