Merge pull request #41156 from AkihiroSuda/rootless-new-shim-socket-path
dockerd-rootless.sh: support new containerd shim socket path convention
This commit is contained in:
commit
a637034ee4
|
@ -94,6 +94,6 @@ 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/xtables.lock
|
rm -f /run/docker /run/containerd /run/xtables.lock
|
||||||
exec dockerd $@
|
exec dockerd $@
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue