浏览代码

Merge pull request #45325 from kpcyrd/rootless-script-bugs

Fix argv quoting bugs in dockerd-rootless.sh
Sebastiaan van Stijn 2 年之前
父节点
当前提交
cca3af03ac
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      contrib/dockerd-rootless.sh

+ 2 - 3
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