projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3826: Merge branch 'master' into 3826-crunchstat-netstats
[arvados.git]
/
sdk
/
python
/
arvados
/
commands
/
keepdocker.py
diff --git
a/sdk/python/arvados/commands/keepdocker.py
b/sdk/python/arvados/commands/keepdocker.py
index d0f60bf806f03fcf37e0212c2c6ef8f2d47856c9..c36da3b36010d9c1a5de4848a23f5713f04feee9 100644
(file)
--- a/
sdk/python/arvados/commands/keepdocker.py
+++ b/
sdk/python/arvados/commands/keepdocker.py
@@
-9,6
+9,7
@@
import subprocess
import sys
import tarfile
import tempfile
import sys
import tarfile
import tempfile
+import _strptime
from collections import namedtuple
from stat import *
from collections import namedtuple
from stat import *
@@
-116,7
+117,8
@@
def stat_cache_name(image_file):
return getattr(image_file, 'name', image_file) + '.stat'
def pull_image(image_name, image_tag):
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
def save_image(image_hash, image_file):
# Save the specified Docker image to image_file, then try to save its
@@
-254,7
+256,7
@@
def main(arguments=None):
filters=[['link_class', '=', 'docker_image_repo+tag'],
['name', '=', image_repo_tag],
['head_uuid', 'in', collections]]
filters=[['link_class', '=', 'docker_image_repo+tag'],
['name', '=', image_repo_tag],
['head_uuid', 'in', collections]]
- ).execute(num_retries=args
_
retries)['items']) if image_repo_tag else []
+ ).execute(num_retries=args
.
retries)['items']) if image_repo_tag else []
# Filter on elements owned by the parent project
owned_col = [c for c in collections if c['owner_uuid'] == parent_project_uuid]
# Filter on elements owned by the parent project
owned_col = [c for c in collections if c['owner_uuid'] == parent_project_uuid]