kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

dockerd-rootless.sh: Fix variable not double quotes cause unexpected behavior 

```
$ cat test.sh

echo "orign value=$XDG_RUNTIME_DIR"

echo "1. with [ ] not quote ..."
[ -w $XDG_RUNTIME_DIR ]
echo "get 1 ret_code: $?"

echo "2. with [ ] and quote ..."
[ -w "$XDG_RUNTIME_DIR" ]
echo "get 2 ret_code: $?"

$ sh ./test.sh
orign value=
1. with [ ] not quote ...
get 1 ret_code: 0
2. with [ ] and quote ...
get 2 ret_code: 1

$ bash ./test.sh
orign value=
1. with [ ] not quote ...
get 1 ret_code: 0
2. with [ ] and quote ...
get 2 ret_code: 1
```

Signed-off-by: Chenyang Yan <memory.yancy@gmail.com>
(cherry picked from commit a8ce4d47c3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Chenyang Yan 2021-10-17 18:14:39 +08:00 committed by Sebastiaan van Stijn
parent 2c6aa5aad9
commit 59d2a2c397
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/dockerd-rootless.sh
View File

@ -24,11 +24,11 @@ case "$1" in
exit 1 exit 1
;; ;;
esac esac
if ! [ -w $XDG_RUNTIME_DIR ]; then if ! [ -w "$XDG_RUNTIME_DIR" ]; then
echo "XDG_RUNTIME_DIR needs to be set and writable" echo "XDG_RUNTIME_DIR needs to be set and writable"
exit 1 exit 1
fi fi
if ! [ -d $HOME ]; then if ! [ -d "$HOME" ]; then
echo "HOME needs to be set and exist." echo "HOME needs to be set and exist."
exit 1 exit 1
fi fi
@ -40,7 +40,7 @@ for f in docker-rootlesskit rootlesskit; do
break break
fi fi
done done
if [ -z $rootlesskit ]; then if [ -z "$rootlesskit" ]; then
echo "rootlesskit needs to be installed" echo "rootlesskit needs to be installed"
exit 1 exit 1
fi fi
@ -52,19 +52,19 @@ fi
: "${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SECCOMP:=auto}" : "${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SECCOMP:=auto}"
net=$DOCKERD_ROOTLESS_ROOTLESSKIT_NET net=$DOCKERD_ROOTLESS_ROOTLESSKIT_NET
mtu=$DOCKERD_ROOTLESS_ROOTLESSKIT_MTU mtu=$DOCKERD_ROOTLESS_ROOTLESSKIT_MTU
if [ -z $net ]; then if [ -z "$net" ]; then
if command -v slirp4netns > /dev/null 2>&1; then if command -v slirp4netns > /dev/null 2>&1; then
# If --netns-type is present in --help, slirp4netns is >= v0.4.0. # If --netns-type is present in --help, slirp4netns is >= v0.4.0.
if slirp4netns --help | grep -qw -- --netns-type; then if slirp4netns --help | grep -qw -- --netns-type; then
net=slirp4netns net=slirp4netns
if [ -z $mtu ]; then if [ -z "$mtu" ]; then
mtu=65520 mtu=65520
fi fi
else else
echo "slirp4netns found but seems older than v0.4.0. Falling back to VPNKit." echo "slirp4netns found but seems older than v0.4.0. Falling back to VPNKit."
fi fi
fi fi
if [ -z $net ]; then if [ -z "$net" ]; then
if command -v vpnkit > /dev/null 2>&1; then if command -v vpnkit > /dev/null 2>&1; then
net=vpnkit net=vpnkit
else else
@ -73,11 +73,11 @@ if [ -z $net ]; then
fi fi
fi fi
fi fi
if [ -z $mtu ]; then if [ -z "$mtu" ]; then
mtu=1500 mtu=1500
fi fi
if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then if [ -z "$_DOCKERD_ROOTLESS_CHILD" ]; then
_DOCKERD_ROOTLESS_CHILD=1 _DOCKERD_ROOTLESS_CHILD=1
export _DOCKERD_ROOTLESS_CHILD export _DOCKERD_ROOTLESS_CHILD
if [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
@ -107,7 +107,7 @@ if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then
$DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS \ $DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS \
$0 $@ $0 $@
else else
[ $_DOCKERD_ROOTLESS_CHILD = 1 ] [ "$_DOCKERD_ROOTLESS_CHILD" = 1 ]
# remove the symlinks for the existing files in the parent namespace if any, # remove the symlinks for the existing files in the parent namespace if any,
# so that we can create our own files in our mount namespace. # so that we can create our own files in our mount namespace.
rm -f /run/docker /run/containerd /run/xtables.lock rm -f /run/docker /run/containerd /run/xtables.lock