kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #41557 from AkihiroSuda/cherrypick-41156-1903 

[19.03 backport] dockerd-rootless.sh: support new containerd shim socket path convention
This commit is contained in:
Brian Goff 2020-10-16 13:06:56 -07:00 committed by GitHub
parent b27122246a c7253a0e1a
commit bb69504a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dockerd-rootless.sh
View File

@ -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