projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
[arvados.git]
/
services
/
dockercleaner
/
arvados_docker
/
cleaner.py
diff --git
a/services/dockercleaner/arvados_docker/cleaner.py
b/services/dockercleaner/arvados_docker/cleaner.py
index 2435e6de806043b4e014071e8f9e05f06b159c4e..88b8a4bc3c5f3330d42859ee9a40d0b3ffdd2e47 100755
(executable)
--- a/
services/dockercleaner/arvados_docker/cleaner.py
+++ b/
services/dockercleaner/arvados_docker/cleaner.py
@@
-191,7
+191,7
@@
class DockerImageCleaner(DockerImageUseRecorder):
def _remove_container(self, cid):
try:
def _remove_container(self, cid):
try:
- self.docker_client.remove_container(cid)
+ self.docker_client.remove_container(cid
, v=True
)
except docker.errors.APIError as error:
logger.warning("Failed to remove container %s: %s", cid, error)
else:
except docker.errors.APIError as error:
logger.warning("Failed to remove container %s: %s", cid, error)
else:
@@
-288,7
+288,7
@@
def run(args, docker_client):
def main(arguments):
args = parse_arguments(arguments)
setup_logging(args)
def main(arguments):
args = parse_arguments(arguments)
setup_logging(args)
- run(args, docker.Client())
+ run(args, docker.Client(
version='1.14'
))
if __name__ == '__main__':
main(sys.argv[1:])
if __name__ == '__main__':
main(sys.argv[1:])