8000 [19.03 backport] dockerd-rootless.sh: support new containerd shim socket path convention by AkihiroSuda · Pull Request #41557 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

[19.03 backport] dockerd-rootless.sh: support new containerd shim socket path convention #41557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2020
Merged

[19.03 backport] dockerd-rootless.sh: support new containerd shim socket path convention #41557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 794aa20)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
@AkihiroSuda
AkihiroSuda committed Oct 16, 2020
commit c7253a0e1ac88bd8eb0db409570a685a5f6258f3
2 changes: 1 addition & 1 deletion contrib/dockerd-rootless.sh
6CB7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ else
[ $_DOCKERD_ROOTLESS_CHILD = 1 ]
# 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.
rm -f /run/docker /run/xtables.lock
rm -f /run/docker /run/containerd /run/xtables.lock
exec dockerd $@
fi
0