From f294ce2b1193c8d927ba03b0c973bdd1f1db0b52 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 8 Apr 2020 15:48:14 +0200 Subject: [PATCH] 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 (cherry picked from commit 6423f9d6eee9bf22f30ff7a7b5d92c6a06112625) --- paunch/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paunch/__init__.py b/paunch/__init__.py index d8170f3..1cfef93 100644 --- a/paunch/__init__.py +++ b/paunch/__init__.py @@ -134,6 +134,7 @@ def debug(config_id, container_name, action, config, managed_by, labels=None, '--name', r.unique_container_name(container_name) ] + builder.label_arguments(cmd, container_name) builder.docker_run_args(cmd, container_name) print(' '.join(cmd)) elif action == 'run': @@ -143,6 +144,7 @@ def debug(config_id, container_name, action, config, managed_by, labels=None, '--name', r.unique_container_name(container_name) ] + builder.label_arguments(cmd, container_name) builder.docker_run_args(cmd, container_name) return r.execute_interactive(cmd, log) elif action == 'dump-yaml':