@@ -20,7 +20,6 @@ def dockerfile(self_module, input_params):
20
20
run_command_arc = prune_result ['new_input' ]
21
21
current_directory = os .getcwd ()
22
22
is_quiet_mode = input_params .get ('quiet' , False )
23
- verbose = input_params .get ('v' , False )
24
23
is_console_output = input_params .get ('out' ) == 'con'
25
24
26
25
# Step 2: Search for scripts
@@ -88,8 +87,7 @@ def dockerfile(self_module, input_params):
88
87
new_state_keys_from_meta = [], # Add state keys from meta if needed
89
88
add_deps_recursive = add_deps_recursive ,
90
89
run_state = run_state ,
91
- recursion_spaces = '' ,
92
- verbose = verbose # Set to True or False as needed
90
+ recursion_spaces = ''
93
91
)
94
92
if update_variations_result ['return' ] > 0 :
95
93
return update_variations_result
@@ -109,7 +107,7 @@ def dockerfile(self_module, input_params):
109
107
deps = docker_settings .get ('build_deps' , [])
110
108
if deps :
111
109
r = self_module ._run_deps (
112
- deps , [], env , {}, {}, {}, {}, '' , [], '' , False , '' , verbose ,
110
+ deps , [], env , {}, {}, {}, {}, '' , [], '' , False , '' ,
113
111
show_time , ' ' , run_state )
114
112
if r ['return' ] > 0 :
115
113
return r
@@ -180,7 +178,7 @@ def dockerfile(self_module, input_params):
180
178
'comments' : comments , 'run_cmd' : f"{ run_command_string } --quiet" ,
181
179
'script_tags' : input_params .get ('tags' ), 'env' : env ,
182
180
'dockerfile_env' : dockerfile_env ,
183
- 'quiet' : True , 'v' : input_params .get ('v' , False ), 'real_run ' : True
181
+ 'quiet' : True , 'real_run' : True , '- v' : is_true ( input_params .get ('v' , input_params . get ( 'verbose' , False ))) , '-s ' : is_true ( input_params . get ( 's' , input_params . get ( 'silent' , False )))
184
182
}
185
183
mlc_docker_input .update (docker_inputs )
186
184
@@ -209,7 +207,6 @@ def docker_run(self_module, i):
209
207
210
208
# Extract and handle basic inputs
211
209
quiet = i .get ('quiet' , False )
212
- verbose = i .get ('v' , False )
213
210
show_time = i .get ('show_time' , False )
214
211
logger = self_module .logger
215
212
env = i .get ('env' , {})
@@ -296,8 +293,7 @@ def docker_run(self_module, i):
296
293
posthook_deps = [],
297
294
new_env_keys_from_meta = [],
298
295
new_state_keys_from_meta = [],
299
- add_deps_recursive = add_deps_recursive , run_state = run_state , recursion_spaces = '' ,
300
- verbose = False )
296
+ add_deps_recursive = add_deps_recursive , run_state = run_state , recursion_spaces = '' )
301
297
if r ['return' ] > 0 :
302
298
return r
303
299
@@ -306,7 +302,7 @@ def docker_run(self_module, i):
306
302
deps = docker_settings .get ('deps' , [])
307
303
if deps :
308
304
r = self_module ._run_deps (
309
- deps , [], env , {}, {}, {}, {}, '' , [], '' , False , '' , verbose ,
305
+ deps , [], env , {}, {}, {}, {}, '' , [], '' , False , '' ,
310
306
show_time , ' ' , run_state )
311
307
if r ['return' ] > 0 :
312
308
return r
@@ -374,7 +370,7 @@ def docker_run(self_module, i):
374
370
'action' : 'run' , 'target' : 'script' , 'tags' : 'run,docker,container' ,
375
371
'rebuild' : rebuild_docker_image ,
376
372
'env' : env , 'mounts' : mounts ,
377
- 'script_tags' : i .get ('tags' ), 'run_cmd' : final_run_cmd , 'v' : verbose ,
373
+ 'script_tags' : i .get ('tags' ), 'run_cmd' : final_run_cmd ,
378
374
'quiet' : True , 'real_run' : True , 'add_deps_recursive' : {'build-docker-image' : {'dockerfile' : dockerfile_path }},
379
375
** docker_inputs
380
376
}
0 commit comments