diff options
| author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-06-10 22:59:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 22:59:23 -0400 |
| commit | 1eb63c7567430e5f5b862b348dc9c3f61a1ede4e (patch) | |
| tree | c827df9af82fb2b3211835f00a21e2e142178da2 | |
| parent | 964d9b3a6d79890bb5e6ef3a9b72be7620561319 (diff) | |
| parent | b9b727f435d359ed1ddc3f80851f4df263346f0e (diff) | |
| download | ansible-modules-core-1eb63c7567430e5f5b862b348dc9c3f61a1ede4e.tar.gz | |
Merge pull request #3928 from chouseknecht/fix_16211
Fix #3927 - only stop/kill running containers
| -rw-r--r-- | cloud/docker/docker_container.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py index 7d628490..e9afaa37 100644 --- a/cloud/docker/docker_container.py +++ b/cloud/docker/docker_container.py @@ -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: |