From 7ebf3d7a8806abfd5fd4f38e4f1f987992f65f32 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 3 Aug 2016 14:28:05 +0100 Subject: [PATCH] Don't crash when dockerCli is nil --- prog/weaver/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 210f5bf2..2086badf 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -298,9 +298,11 @@ func main() { } allocator, defaultSubnet = createAllocator(router, ipamConfig, db, t, isKnownPeer) observeContainers(allocator) - ids, err := dockerCli.AllContainerIDs() - checkFatal(err) - allocator.PruneOwned(ids) + if dockerCli != nil { + ids, err := dockerCli.AllContainerIDs() + checkFatal(err) + allocator.PruneOwned(ids) + } } var (