diff --git a/cmd/dockerd/config_common_unix.go b/cmd/dockerd/config_common_unix.go deleted file mode 100644 index ab64539fe3..0000000000 --- a/cmd/dockerd/config_common_unix.go +++ /dev/null @@ -1,43 +0,0 @@ -//go:build linux || freebsd -// +build linux freebsd - -package main - -import ( - "path/filepath" - - "github.com/docker/docker/pkg/homedir" -) - -func getDefaultPidFile() (string, error) { - if !honorXDG { - return "/var/run/docker.pid", nil - } - runtimeDir, err := homedir.GetRuntimeDir() - if err != nil { - return "", err - } - return filepath.Join(runtimeDir, "docker.pid"), nil -} - -func getDefaultDataRoot() (string, error) { - if !honorXDG { - return "/var/lib/docker", nil - } - dataHome, err := homedir.GetDataHome() - if err != nil { - return "", err - } - return filepath.Join(dataHome, "docker"), nil -} - -func getDefaultExecRoot() (string, error) { - if !honorXDG { - return "/var/run/docker", nil - } - runtimeDir, err := homedir.GetRuntimeDir() - if err != nil { - return "", err - } - return filepath.Join(runtimeDir, "docker"), nil -} diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index 6e6aa81bed..51a27eb326 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go @@ -97,3 +97,36 @@ func configureCertsDir() { } } } + +func getDefaultPidFile() (string, error) { + if !honorXDG { + return "/var/run/docker.pid", nil + } + runtimeDir, err := homedir.GetRuntimeDir() + if err != nil { + return "", err + } + return filepath.Join(runtimeDir, "docker.pid"), nil +} + +func getDefaultDataRoot() (string, error) { + if !honorXDG { + return "/var/lib/docker", nil + } + dataHome, err := homedir.GetDataHome() + if err != nil { + return "", err + } + return filepath.Join(dataHome, "docker"), nil +} + +func getDefaultExecRoot() (string, error) { + if !honorXDG { + return "/var/run/docker", nil + } + runtimeDir, err := homedir.GetRuntimeDir() + if err != nil { + return "", err + } + return filepath.Join(runtimeDir, "docker"), nil +}