@@ -127,26 +127,27 @@ def get_image(
127
127
except (OSError , subprocess .CalledProcessError , UnicodeError ):
128
128
pass
129
129
130
+ cmd : List [str ] = []
131
+ if "dockerFile" in docker_requirement :
132
+ dockerfile_dir = create_tmp_dir (tmp_outdir_prefix )
133
+ with open (os .path .join (dockerfile_dir , "Dockerfile" ), "w" ) as dfile :
134
+ dfile .write (docker_requirement ["dockerFile" ])
135
+ cmd = [
136
+ self .docker_exec ,
137
+ "build" ,
138
+ "--tag=%s" % str (docker_requirement ["dockerImageId" ]),
139
+ dockerfile_dir ,
140
+ ]
141
+ _logger .info (str (cmd ))
142
+ subprocess .check_call (cmd , stdout = sys .stderr ) # nosec
143
+ found = True
144
+
130
145
if (force_pull or not found ) and pull_image :
131
- cmd : List [str ] = []
132
146
if "dockerPull" in docker_requirement :
133
147
cmd = [self .docker_exec , "pull" , str (docker_requirement ["dockerPull" ])]
134
148
_logger .info (str (cmd ))
135
149
subprocess .check_call (cmd , stdout = sys .stderr ) # nosec
136
150
found = True
137
- elif "dockerFile" in docker_requirement :
138
- dockerfile_dir = create_tmp_dir (tmp_outdir_prefix )
139
- with open (os .path .join (dockerfile_dir , "Dockerfile" ), "w" ) as dfile :
140
- dfile .write (docker_requirement ["dockerFile" ])
141
- cmd = [
142
- self .docker_exec ,
143
- "build" ,
144
- "--tag=%s" % str (docker_requirement ["dockerImageId" ]),
145
- dockerfile_dir ,
146
- ]
147
- _logger .info (str (cmd ))
148
- subprocess .check_call (cmd , stdout = sys .stderr ) # nosec
149
- found = True
150
151
elif "dockerLoad" in docker_requirement :
151
152
cmd = [self .docker_exec , "load" ]
152
153
_logger .info (str (cmd ))
0 commit comments