diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2020-10-16 13:06:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-16 13:06:56 -0700 |
| commit | bb69504a4a81baf4b0a31e0a15bef871fc64646d (patch) | |
| tree | 6db9e4af7f04ce40c4f413a8f2c3e7915c83cb20 | |
| parent | b27122246a7e66c67e720425bdf8144a3193b49f (diff) | |
| parent | c7253a0e1ac88bd8eb0db409570a685a5f6258f3 (diff) | |
| download | docker-bb69504a4a81baf4b0a31e0a15bef871fc64646d.tar.gz | |
Merge pull request #41557 from AkihiroSuda/cherrypick-41156-1903
[19.03 backport] dockerd-rootless.sh: support new containerd shim socket path convention
| -rwxr-xr-x | contrib/dockerd-rootless.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/dockerd-rootless.sh b/contrib/dockerd-rootless.sh index b042808cb2..2fa1987ffb 100755 --- a/contrib/dockerd-rootless.sh +++ b/contrib/dockerd-rootless.sh @@ -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 |