Merge pull request #45331 from thaJeztah/23.0_backport_rootless_script_bugs

[23.0 backport] Fix argument quoting bugs in dockerd-rootless.sh
This commit is contained in:
Bjorn Neergaard 2023-04-13 18:48:55 -06:00 committed by GitHub
commit 5f684cb072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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