Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit a48b2a4

Browse files
committed
dockerd-rootless.sh: support containerd v1.4 shim socket path convention
The new shim socket path convention hardcodes `/run/containerd`: containerd/containerd#4343 `dockerd-rootless.sh` is updated to hide the rootful `/run/containerd` from the mount namespace of the rootless dockerd. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 794aa20983c9384726721e1c5d3a552ef7f8f4cf) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Upstream-commit: c7253a0e1ac88bd8eb0db409570a685a5f6258f3 Component: engine
1 parent 13fede6 commit a48b2a4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

components/engine/contrib/dockerd-rootless.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ else
8888
[ $_DOCKERD_ROOTLESS_CHILD = 1 ]
8989
# remove the symlinks for the existing files in the parent namespace if any,
9090
# so that we can create our own files in our mount namespace.
91-
rm -f /run/docker /run/xtables.lock
91+
rm -f /run/docker /run/containerd /run/xtables.lock
9292
exec dockerd $@
9393
fi

0 commit comments

Comments
 (0)