From 2c7d9cde7959f874ec682fb39e5ebf25102ea113 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 7 Jun 2017 08:53:49 -0700 Subject: [PATCH] override Docker entrypoint always --- cwltool/draft2tool.py | 2 +- cwltool/job.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cwltool/draft2tool.py b/cwltool/draft2tool.py index e226e9e47..70cf3d529 100644 --- a/cwltool/draft2tool.py +++ b/cwltool/draft2tool.py @@ -218,7 +218,7 @@ def job(self, (docker_req, docker_is_req) = self.get_requirement("DockerRequirement") if docker_req and kwargs.get("use_container") is not False: dockerimg = docker_req.get("dockerImageId") or docker_req.get("dockerPull") - cmdline = ["docker", "run", dockerimg] + cmdline + cmdline = ["docker", "run", "--entrypoint", "''", dockerimg] + cmdline keydict = {u"cmdline": cmdline} for _, f in cachebuilder.pathmapper.items(): diff --git a/cwltool/job.py b/cwltool/job.py index 60573cbad..825fec1e8 100644 --- a/cwltool/job.py +++ b/cwltool/job.py @@ -345,7 +345,7 @@ def run(self, pull_image=True, rm_container=True, self._setup() - runtime = [u"docker", u"run", u"-i"] + runtime = [u"docker", u"run", u"-i", u"--entrypoint", u""] runtime.append(u"--volume=%s:%s:rw" % (os.path.realpath(self.outdir), self.builder.outdir)) runtime.append(u"--volume=%s:%s:rw" % (os.path.realpath(self.tmpdir), "/tmp"))