Skip to content

Commit 6c64a8b

Browse files
Brandon Duane WalkerBrandon Duane Walker
authored andcommitted
patch dockerFile build
1 parent 9875cf4 commit 6c64a8b

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

cwltool/docker.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,26 +126,27 @@ def get_image(
126126
except (OSError, subprocess.CalledProcessError, UnicodeError):
127127
pass
128128

129+
cmd: List[str] = []
130+
if "dockerFile" in docker_requirement:
131+
dockerfile_dir = create_tmp_dir(tmp_outdir_prefix)
132+
with open(os.path.join(dockerfile_dir, "Dockerfile"), "w") as dfile:
133+
dfile.write(docker_requirement["dockerFile"])
134+
cmd = [
135+
self.docker_exec,
136+
"build",
137+
"--tag=%s" % str(docker_requirement["dockerImageId"]),
138+
dockerfile_dir,
139+
]
140+
_logger.info(str(cmd))
141+
subprocess.check_call(cmd, stdout=sys.stderr) # nosec
142+
found = True
143+
129144
if (force_pull or not found) and pull_image:
130-
cmd: List[str] = []
131145
if "dockerPull" in docker_requirement:
132146
cmd = [self.docker_exec, "pull", str(docker_requirement["dockerPull"])]
133147
_logger.info(str(cmd))
134148
subprocess.check_call(cmd, stdout=sys.stderr) # nosec
135149
found = True
136-
elif "dockerFile" in docker_requirement:
137-
dockerfile_dir = create_tmp_dir(tmp_outdir_prefix)
138-
with open(os.path.join(dockerfile_dir, "Dockerfile"), "w") as dfile:
139-
dfile.write(docker_requirement["dockerFile"])
140-
cmd = [
141-
self.docker_exec,
142-
"build",
143-
"--tag=%s" % str(docker_requirement["dockerImageId"]),
144-
dockerfile_dir,
145-
]
146-
_logger.info(str(cmd))
147-
subprocess.check_call(cmd, stdout=sys.stderr) # nosec
148-
found = True
149150
elif "dockerLoad" in docker_requirement:
150151
cmd = [self.docker_exec, "load"]
151152
_logger.info(str(cmd))

0 commit comments

Comments
 (0)