cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3928 from chouseknecht/fix_16211

Browse source 
Fix #3927 - only stop/kill running containers
This commit is contained in:
Chris Houseknecht 2016-06-10 22:59:23 -04:00 committed by GitHub
commit 1eb63c7567
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cloud/docker/docker_container.py
View file

@ -1616,7 +1616,8 @@ class ContainerManager(DockerBaseClass):
self.diff['image_different'] = True
self.log("differences")
self.log(differences, pretty_print=True)
self.container_stop(container.Id)
if container.running:
self.container_stop(container.Id)
self.container_remove(container.Id)
new_container = self.container_create(self.parameters.image, self.parameters.create_parameters)
if new_container: