Merge branch '12764-writable-file' refs #12764

[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 448695902ba51bd70d64cca1ab0983affd36341a..ea85b35fc5cbd4d528f1c69507ffaae9fb2717b0 100644 (file)
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -358,13 +358,15 @@ def main(arguments=None, stdout=sys.stdout):
                 raise
         sys.exit(0)
 
-    if ':' in args.image:
+    if re.search(r':\w[-.\w]{0,127}$', args.image):
+        # image ends with :valid-tag
         if args.tag is not None:
             logger.error(
                 "image %r already includes a tag, cannot add tag argument %r",
                 args.image, args.tag)
             sys.exit(1)
-        args.image, args.tag = args.image.split(':', 1)
+        # rsplit() accommodates "myrepo.example:8888/repo/image:tag"
+        args.image, args.tag = args.image.rsplit(':', 1)
     elif args.tag is None:
         args.tag = 'latest'