Process labels before building container run args
The consistent way of building container run arguments is processing labels (possibly multiple) first. Fix 'debug' actions 'run' and 'print-cmd' to not falling behind of that pattern already proved working well for containers 'apply'. Change-Id: I771d086cc75695d7ce2db35c852bb35bb4c59708 Related-Bug: #1798362 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
parent
b2a8afb770
commit
21c32c8c60
|
@ -197,6 +197,7 @@ def debug(config_id, container_name, action, config, managed_by, labels=None,
|
||||||
'--name',
|
'--name',
|
||||||
uname
|
uname
|
||||||
]
|
]
|
||||||
|
builder.label_arguments(cmd, container_name)
|
||||||
builder.container_run_args(cmd, container_name, uname)
|
builder.container_run_args(cmd, container_name, uname)
|
||||||
|
|
||||||
if '--health-cmd' in cmd:
|
if '--health-cmd' in cmd:
|
||||||
|
@ -219,6 +220,7 @@ def debug(config_id, container_name, action, config, managed_by, labels=None,
|
||||||
'--name',
|
'--name',
|
||||||
uname
|
uname
|
||||||
]
|
]
|
||||||
|
builder.label_arguments(cmd, container_name)
|
||||||
if builder.container_run_args(cmd, container_name, uname):
|
if builder.container_run_args(cmd, container_name, uname):
|
||||||
return r.execute_interactive(cmd, log)
|
return r.execute_interactive(cmd, log)
|
||||||
elif action == 'dump-yaml':
|
elif action == 'dump-yaml':
|
||||||
|
|
Loading…
Reference in New Issue