diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index 2d9f0b8b3e..362d43666f 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -143,10 +143,12 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { }() } - // Set sticky bit if XDG_RUNTIME_DIR is set && the file is actually under XDG_RUNTIME_DIR - if _, err := homedir.StickRuntimeDirContents(potentiallyUnderRuntimeDir); err != nil { - // StickRuntimeDirContents returns nil error if XDG_RUNTIME_DIR is just unset - logrus.WithError(err).Warn("cannot set sticky bit on files under XDG_RUNTIME_DIR") + if cli.Config.IsRootless() { + // Set sticky bit if XDG_RUNTIME_DIR is set && the file is actually under XDG_RUNTIME_DIR + if _, err := homedir.StickRuntimeDirContents(potentiallyUnderRuntimeDir); err != nil { + // StickRuntimeDirContents returns nil error if XDG_RUNTIME_DIR is just unset + logrus.WithError(err).Warn("cannot set sticky bit on files under XDG_RUNTIME_DIR") + } } serverConfig, err := newAPIServerConfig(cli)