@@ -168,7 +168,7 @@ def _render_params(kwargs) -> dict[str, list[Any]]:
168
168
raise PodmanError ("Custom encoding not supported when gzip enabled." )
169
169
170
170
params = {
171
- "dockerfile" : kwargs .get ("dockerfile" ),
171
+ "dockerfile" : kwargs .get ("dockerfile" , f".containerfile. { random . getrandbits ( 160 ):x } " ),
172
172
"forcerm" : kwargs .get ("forcerm" ),
173
173
"httpproxy" : kwargs .get ("http_proxy" ),
174
174
"networkmode" : kwargs .get ("network_mode" ),
@@ -182,9 +182,11 @@ def _render_params(kwargs) -> dict[str, list[Any]]:
182
182
"squash" : kwargs .get ("squash" ),
183
183
"t" : kwargs .get ("tag" ),
184
184
"target" : kwargs .get ("target" ),
185
- "layers" : kwargs .get ("layers" ),
185
+ "layers" : kwargs .get ("layers" , True ),
186
186
"output" : kwargs .get ("output" ),
187
- "outputformat" : kwargs .get ("outputformat" ),
187
+ "outputformat" : kwargs .get (
188
+ "outputformat" , "application/vnd.oci.image.manifest.v1+json"
189
+ ),
188
190
}
189
191
190
192
if "buildargs" in kwargs :
@@ -205,16 +207,5 @@ def _render_params(kwargs) -> dict[str, list[Any]]:
205
207
if "labels" in kwargs :
206
208
params ["labels" ] = json .dumps (kwargs .get ("labels" ))
207
209
208
- def default (value , def_value ):
209
- return def_value if value is None else value
210
-
211
- params ["outputformat" ] = default (
212
- params ["outputformat" ], "application/vnd.oci.image.manifest.v1+json"
213
- )
214
- params ["layers" ] = default (params ["layers" ], True )
215
- params ["dockerfile" ] = default (
216
- params ["dockerfile" ], f".containerfile.{ random .getrandbits (160 ):x} "
217
- )
218
-
219
210
# Remove any unset parameters
220
211
return dict (filter (lambda i : i [1 ] is not None , params .items ()))
0 commit comments