"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "contrib/dockerd-rootless.sh" between
moby-20.10.6.tar.gz and moby-20.10.7.tar.gz

About: Moby is a framework to assemble specialized container systems (formerly project name Docker; see here to clarify the relationship between the projects).

dockerd-rootless.sh  (moby-20.10.6):dockerd-rootless.sh  (moby-20.10.7)
skipping to change at line 38 skipping to change at line 38
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 ! [ -w $HOME ]; then if ! [ -w $HOME ]; then
echo "HOME needs to be set and writable" echo "HOME needs to be set and writable"
exit 1 exit 1
fi fi
rootlesskit="" rootlesskit=""
for f in docker-rootlesskit rootlesskit; do for f in docker-rootlesskit rootlesskit; do
if which $f > /dev/null 2>&1; then if command -v $f > /dev/null 2>&1; then
rootlesskit=$f rootlesskit=$f
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
: "${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:=}" : "${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:=}"
: "${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:=}" : "${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:=}"
: "${DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER:=builtin}" : "${DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER:=builtin}"
: "${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SANDBOX:=auto}" : "${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SANDBOX:=auto}"
: "${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 which 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. Fall ing back to VPNKit." echo "slirp4netns found but seems older than v0.4.0. Fall ing back to VPNKit."
fi fi
fi fi
if [ -z $net ]; then if [ -z $net ]; then
if which vpnkit > /dev/null 2>&1; then if command -v vpnkit > /dev/null 2>&1; then
net=vpnkit net=vpnkit
else else
echo "Either slirp4netns (>= v0.4.0) or vpnkit needs to b e installed" echo "Either slirp4netns (>= v0.4.0) or vpnkit needs to b e installed"
exit 1 exit 1
fi fi
fi fi
fi fi
if [ -z $mtu ]; then if [ -z $mtu ]; then
mtu=1500 mtu=1500
fi fi
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)