E582 dockerd-rootless.sh: support containerd v1.4 shim socket path convention · AkihiroSuda/docker@794aa20 · GitHub
[go: up one dir, main page]
Skip to content

Commit 794aa20

Browse files
AkihiroSudaAkihiroSuda
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>
1 parent 13a56fe commit 794aa20

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎contrib/dockerd-rootless.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ else
9494
[ $_DOCKERD_ROOTLESS_CHILD = 1 ]
9595
# remove the symlinks for the existing files in the parent namespace if any,
9696
# so that we can create our own files in our mount namespace.
97-
rm -f /run/docker /run/xtables.lock
97+
rm -f /run/docker /run/containerd /run/xtables.lock
9898
exec dockerd $@
9999
fi

0 commit comments

Comments
 (0)
0