From 608ddbea29ed7b5ba85efdf465e844b2a32494c4 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 9 Mar 2015 11:20:14 -0400 Subject: [PATCH] Include bind mounts in VOLUMES check. --- cloud/docker/docker.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index b1d799f9aaf..ff8391ae6e6 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -816,13 +816,11 @@ class DockerManager(object): continue # VOLUMES - # not including bind modes. expected_volume_keys = set((image['ContainerConfig']['Volumes'] or {}).keys()) if self.volumes: - for key, config in self.volumes.iteritems(): - if not config and key not in self.binds: - expected_volume_keys.add(key) + expected_volume_keys.update(self.volumes.keys()) + actual_volume_keys = set((container['Config']['Volumes'] or {}).keys()) if actual_volume_keys != expected_volume_keys: