4196: arv-keepdocker uses Docker 1.0 pull syntax.

`docker pull -t` was the old way of pulling an image with a specific
tag.  Docker 1.0 introduced `docker pull repo:tag`, and Docker 1.2
removes support for `-t` completely.  We're well-standardized on 1.1+
at this point, and considering an upgrade to 1.2+, so now's the time
to switch.

Closes #4196.

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index c0913747108d24ea679a75451b73dcf78d642604..6fa17453dd357da3ed91b3ee4f0240989eda96b7 100644 (file)
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -116,7 +116,8 @@ def stat_cache_name(image_file):
     return getattr(image_file, 'name', image_file) + '.stat'
 
 def pull_image(image_name, image_tag):
-    check_docker(popen_docker(['pull', '-t', image_tag, image_name]), "pull")
+    check_docker(popen_docker(['pull', '{}:{}'.format(image_name, image_tag)]),
+                 "pull")
 
 def save_image(image_hash, image_file):
     # Save the specified Docker image to image_file, then try to save its