Skip to content
Snippets Groups Projects
Commit e3f1f1fa authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Assume the container is removed if it is not show in docker ps"

parents 3b02e39f ea1ae405
No related branches found
No related tags found
No related merge requests found
...@@ -478,10 +478,18 @@ class DockerWorker(object): ...@@ -478,10 +478,18 @@ class DockerWorker(object):
def remove_container(self): def remove_container(self):
if self.check_container(): if self.check_container():
self.changed = True self.changed = True
self.dc.remove_container( # NOTE(jeffrey4l): in some case, docker failed to remove container
container=self.params.get('name'), # filesystem and raise error. But the container info is
force=True # disappeared already. If this happens, assume the container is
) # removed.
try:
self.dc.remove_container(
container=self.params.get('name'),
force=True
)
except docker.errors.APIError:
if self.check_container():
raise
def generate_volumes(self): def generate_volumes(self):
volumes = self.params.get('volumes') volumes = self.params.get('volumes')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment