kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Windows: Move daemon config directory

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-07-30 12:39:19 -07:00
parent 868f85b271
commit 9ed4400baf
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docker/daemon.go
View file

@ -8,7 +8,6 @@ import (
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"time" "time"
@ -319,11 +318,3 @@ func shutdownDaemon(d *daemon.Daemon, timeout time.Duration) {
logrus.Error("Force shutdown daemon") logrus.Error("Force shutdown daemon")
} }
} }
func getDaemonConfDir() string {
// TODO: update for Windows daemon
if runtime.GOOS == "windows" {
return cliconfig.ConfigDir()
}
return "/etc/docker"
}

4
docker/daemon_unix.go
View file

@ -44,3 +44,7 @@ func setDefaultUmask() error {
return nil return nil
} }
func getDaemonConfDir() string {
return "/etc/docker"
}

6
docker/daemon_windows.go
View file

@ -3,6 +3,8 @@
package main package main
import ( import (
"os"
apiserver "github.com/docker/docker/api/server" apiserver "github.com/docker/docker/api/server"
"github.com/docker/docker/daemon" "github.com/docker/docker/daemon"
) )
@ -21,3 +23,7 @@ func currentUserIsOwner(f string) bool {
func setDefaultUmask() error { func setDefaultUmask() error {
return nil return nil
} }
func getDaemonConfDir() string {
return os.Getenv("PROGRAMDATA") + `\docker\config`
}