Merge pull request #222 from denis-yuen/disable_user

Allow disabling matching the container user to the running user

Author: mr-c

cwltool/job.py

@@ -172,7 +172,9 @@ def run(self, dry_run=False, pull_image=True, rm_container=True,
                 runtime.append("--log-driver=none")
 
             euid = docker_vm_uid() or os.geteuid()
-            runtime.append(u"--user=%s" % (euid))
+
+            if kwargs.get("no_match_user",None) is False:
+                runtime.append(u"--user=%s" % (euid))
 
             if rm_container:
                 runtime.append("--rm")

cwltool/main.py

@@ -156,6 +156,8 @@ def arg_parser():  # type: () -> argparse.ArgumentParser
 
     parser.add_argument("--default-container",
                         help="Specify a default docker container that will be used if the workflow fails to specify one.")
+    parser.add_argument("--no-match-user", action="store_true",
+                        help="Disable passing the current uid to 'docker run --user`")
     parser.add_argument("--disable-net", action="store_true",
                         help="Use docker's default networking for containers;"
                         " the default is to enable networking.")