fixes #19550 (docker_container with empty links list always restarts)

pull/25014/head
louis 8 years ago committed by Toshio Kuratomi
parent 5f3c887c38
commit 7363776174

@ -1441,7 +1441,10 @@ class DockerManager(object):
for link, alias in (self.links or {}).items(): for link, alias in (self.links or {}).items():
expected_links.add("/{0}:{1}/{2}".format(link, container["Name"], alias)) expected_links.add("/{0}:{1}/{2}".format(link, container["Name"], alias))
actual_links = set(container['HostConfig']['Links'] or []) actual_links = set()
for link in (container['HostConfig']['Links'] or []):
actual_links.add(link)
if actual_links != expected_links: if actual_links != expected_links:
self.reload_reasons.append('links ({0} => {1})'.format(actual_links, expected_links)) self.reload_reasons.append('links ({0} => {1})'.format(actual_links, expected_links))
differing.append(container) differing.append(container)

Loading…
Cancel
Save