automation: avoid globbering the docker run args

[PATCH v1] automation: avoid globbering the docker run args

Olaf Hering posted 1 patch 2 years, 9 months ago

Download mbox

Test gitlab-ci failed

Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20210708145650.8961-1-olaf@aepfle.de

automation/scripts/containerize | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH v1] automation: avoid globbering the docker run args

Posted by Olaf Hering 2 years, 9 months ago

containerize bash -c './configure && make' fails due to shell expansion.

Collect all arguments for the script and pass them verbatim to the
docker run command.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 automation/scripts/containerize | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 59edf0ba40..7682ccd347 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -47,10 +47,10 @@ case "_${CONTAINER_UID0}" in
 esac
 
 # Save the commands for future use
-cmd=$@
+cmd=("$@")
 
 # If no command was specified, just drop us into a shell if we're interactive
-[ $# -eq 0 ] && tty -s && cmd="/bin/bash"
+[ $# -eq 0 ] && tty -s && cmd=("/bin/bash")
 
 # Are we in an interactive terminal?
 tty -s && termint=t
@@ -104,4 +104,4 @@ exec ${docker_cmd} run \
     ${CONTAINER_ARGS} \
     -${termint}i --rm -- \
     ${CONTAINER} \
-    ${cmd}
+    "${cmd[@]}"

Re: [PATCH v1] automation: avoid globbering the docker run args

Posted by Andrew Cooper 2 years, 9 months ago

On 08/07/2021 15:56, Olaf Hering wrote:
> containerize bash -c './configure && make' fails due to shell expansion.
>
> Collect all arguments for the script and pass them verbatim to the
> docker run command.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Andrew Cooper <andew.cooper3@citrix.com>