From d625ce9494aac3cbe54f97ec55a7048a83bf2eb9 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 22 Jan 2015 10:29:15 -0800 Subject: [PATCH] Add TODO lines for windows Signed-off-by: Derek McGowan (github: dmcgowan) Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab Component: engine --- components/engine/docker/flags.go | 1 + components/engine/integration-cli/docker_cli_daemon_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/components/engine/docker/flags.go b/components/engine/docker/flags.go index 29013146f0..3b54612e89 100644 --- a/components/engine/docker/flags.go +++ b/components/engine/docker/flags.go @@ -29,6 +29,7 @@ func getHomeDir() string { } func getDaemonConfDir() string { + // TODO: update for Windows daemon if runtime.GOOS == "windows" { return filepath.Join(os.Getenv("USERPROFILE"), ".docker") } diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go index bb44942c24..51ebdc9acc 100644 --- a/components/engine/integration-cli/docker_cli_daemon_test.go +++ b/components/engine/integration-cli/docker_cli_daemon_test.go @@ -354,6 +354,7 @@ func TestDaemonVolumesBindsRefs(t *testing.T) { } func TestDaemonKeyGeneration(t *testing.T) { + // TODO: skip or update for Windows daemon os.Remove("/etc/docker/key.json") d := NewDaemon(t) if err := d.Start(); err != nil {