20754: Upgrade docker module for docker-cleaner

[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 9c03c9197122f7d4c02606fc6efc28a1ac09e743..df624698ba4407f7a2a61aacd578eed5ca3c6cee 100755 (executable)
--- a/services/dockercleaner/arvados_docker/cleaner.py
+++ b/services/dockercleaner/arvados_docker/cleaner.py
@@ -1,4 +1,8 @@
 #!/usr/bin/env python3
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 """arvados_docker.cleaner - Remove unused Docker images from compute nodes
 
 Usage:
@@ -266,8 +270,9 @@ def load_config(arguments):
     except (FileNotFoundError, IOError, ValueError) as error:
         if (isinstance(error, FileNotFoundError) and
             args.config == DEFAULT_CONFIG_FILE):
-            logger.warning("DEPRECATED: default config file not found; "
-                           "relying on command line configuration")
+            logger.warning("DEPRECATED: default config file %s not found; "
+                           "relying on command line configuration",
+                           repr(DEFAULT_CONFIG_FILE))
         else:
             sys.exit('error reading config file {}: {}'.format(
                 args.config, error))
@@ -357,7 +362,7 @@ def main(arguments=sys.argv[1:]):
     config = load_config(arguments)
     configure_logging(config)
     try:
-        run(config, docker.Client(version='1.14'))
+        run(config, docker.APIClient(version='1.35'))
     except KeyboardInterrupt:
         sys.exit(1)