Merge pull request #27460 from Microsoft/jjh/dockerpid

Windows: Calculate PID file after root
Upstream-commit: ce6cfef36d6fa52df6ebdd3dd996d6bebe0f308d
Component: engine
This commit is contained in:
Vincent Demeester
2016-10-22 13:41:42 +02:00
committed by GitHub
2 changed files with 10 additions and 2 deletions

View File

@ -2,14 +2,15 @@ package daemon
import (
"os"
"path/filepath"
"github.com/docker/docker/api/types"
"github.com/spf13/pflag"
)
var (
defaultPidFile = os.Getenv("programdata") + string(os.PathSeparator) + "docker.pid"
defaultGraph = os.Getenv("programdata") + string(os.PathSeparator) + "docker"
defaultPidFile string
defaultGraph = filepath.Join(os.Getenv("programdata"), "docker")
)
// bridgeConfig stores all the bridge driver specific