From e5c23bf9f542e24b8fd757981e71367d2a1a65af Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 5 Jul 2016 13:02:59 +0100 Subject: [PATCH] Don't crash if docker API is disabled by params --- prog/weaver/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 8403e2f1..3d2c1fa3 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -252,6 +252,7 @@ func main() { } var dockerCli *docker.Client + dockerVersion := "none" if dockerAPI != "" { dc, err := docker.NewClient(dockerAPI) if err != nil { @@ -260,13 +261,14 @@ func main() { Log.Info(dc.Info()) } dockerCli = dc + dockerVersion = dockerCli.DockerVersion() } network := "" if isAWSVPC { network = "awsvpc" } - checkForUpdates(dockerCli.DockerVersion(), network) + checkForUpdates(dockerVersion, network) observeContainers := func(o docker.ContainerObserver) { if dockerCli != nil {