Browse code
dockerd-rootless.sh: support containerd v1.4 shim socket path convention
The new shim socket path convention hardcodes `/run/containerd`:
https://github.com/containerd/containerd/pull/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>
Akihiro Suda authored on 2020/06/26 16:45:49Showing 1 changed files
| ... | ... |
@@ -88,6 +88,6 @@ else |
| 88 | 88 |
[ $_DOCKERD_ROOTLESS_CHILD = 1 ] |
| 89 | 89 |
# remove the symlinks for the existing files in the parent namespace if any, |
| 90 | 90 |
# 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 |
|
| 92 | 92 |
exec dockerd $@ |
| 93 | 93 |
fi |