dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-25 00:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41156 from AkihiroSuda/rootless-new-shim-socket-path

Browse Source 
dockerd-rootless.sh: support new containerd shim socket path convention
This commit is contained in:
Tianon Gravi
2020-10-15 12:37:14 -07:00
committed by GitHub
parent b26ce6756f 794aa20983
commit a637034ee4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dockerd-rootless.sh
View File

@@ -94,6 +94,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