Merge pull request #25482 from oeuftete/docker-running-is-running-fix-2015-5

Fix docker.running detection of running container
This commit is contained in:
Thomas S Hatch 2015-07-16 10:58:29 -06:00
commit 331808eb7d

View file

@ -1011,7 +1011,7 @@ def running(name,
image_exists = iinfos['status']
is_running = False
if already_exists:
is_running = __salt__['docker.is_running'](container)
is_running = __salt__['docker.is_running'](name)
# if container exists but is not started, try to start it
if already_exists and (is_running or not start):
return _valid(comment='container {0!r} already exists'.format(name))