diff options
| author | Bjorn Neergaard <bneergaard@mirantis.com> | 2023-04-13 18:48:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 18:48:55 -0600 |
| commit | 5f684cb0721bccade3251b450b1cda043ae18d95 (patch) | |
| tree | c584d1cc3d087ce9c1e7fb010644a7fb2160e0bf | |
| parent | 90e8a0bbf57afeb7da47c9027c4de3abf02c2bd5 (diff) | |
| parent | 3731ce10d43064dced009f8f8591f70205d2bb0b (diff) | |
| download | docker-5f684cb0721bccade3251b450b1cda043ae18d95.tar.gz | |
Merge pull request #45331 from thaJeztah/23.0_backport_rootless_script_bugs
[23.0 backport] Fix argument quoting bugs in dockerd-rootless.sh
| -rwxr-xr-x | contrib/dockerd-rootless.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/dockerd-rootless.sh b/contrib/dockerd-rootless.sh index 4dde90dc27..9f90c21baa 100755 --- a/contrib/dockerd-rootless.sh +++ b/contrib/dockerd-rootless.sh @@ -107,7 +107,7 @@ if [ -z "$_DOCKERD_ROOTLESS_CHILD" ]; then --copy-up=/etc --copy-up=/run \ --propagation=rslave \ $DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS \ - $0 $@ + "$0" "$@" else [ "$_DOCKERD_ROOTLESS_CHILD" = 1 ] # remove the symlinks for the existing files in the parent namespace if any, @@ -130,6 +130,5 @@ else mount --rbind ${realpath_etc_ssl} /etc/ssl fi - # shellcheck disable=SC2086 - exec $dockerd "$@" + exec "$dockerd" "$@" fi |