@@ -126,26 +126,27 @@ def get_image(
126
126
except (OSError , subprocess .CalledProcessError , UnicodeError ):
127
127
pass
128
128
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
+
129
144
if (force_pull or not found ) and pull_image :
130
- cmd : List [str ] = []
131
145
if "dockerPull" in docker_requirement :
132
146
cmd = [self .docker_exec , "pull" , str (docker_requirement ["dockerPull" ])]
133
147
_logger .info (str (cmd ))
134
148
subprocess .check_call (cmd , stdout = sys .stderr ) # nosec
135
149
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
149
150
elif "dockerLoad" in docker_requirement :
150
151
cmd = [self .docker_exec , "load" ]
151
152
_logger .info (str (cmd ))
0 commit comments