Browse Source

Merge pull request #45331 from thaJeztah/23.0_backport_rootless_script_bugs

[23.0 backport] Fix argument quoting bugs in dockerd-rootless.sh
Bjorn Neergaard 2 years ago
parent
commit
5f684cb072
1 changed files with 2 additions and 3 deletions
  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