From 4049f7ed22d003e66669c1dba41bb841f2c33cad Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 11 Dec 2014 13:16:46 -0800
Subject: [PATCH] Rename ~/.docker/hosts to ~/.docker/machines
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
store.go | 2 +-
store_test.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/store.go b/store.go
index c3951c5ec3..3acc1cf0a0 100644
--- a/store.go
+++ b/store.go
@@ -16,7 +16,7 @@ type Store struct {
}
func NewStore() *Store {
- rootPath := filepath.Join(drivers.GetHomeDir(), ".docker", "hosts")
+ rootPath := filepath.Join(drivers.GetHomeDir(), ".docker", "machines")
return &Store{Path: rootPath}
}
diff --git a/store_test.go b/store_test.go
index ddd2114dd2..78951aa2f6 100644
--- a/store_test.go
+++ b/store_test.go
@@ -27,7 +27,7 @@ func (d DriverOptionsMock) Bool(key string) bool {
}
func clearHosts() error {
- return os.RemoveAll(path.Join(drivers.GetHomeDir(), ".docker", "hosts"))
+ return os.RemoveAll(path.Join(drivers.GetHomeDir(), ".docker", "machines"))
}
func TestStoreCreate(t *testing.T) {
@@ -50,7 +50,7 @@ func TestStoreCreate(t *testing.T) {
if host.Name != "test" {
t.Fatal("Host name is incorrect")
}
- path := filepath.Join(drivers.GetHomeDir(), ".docker", "hosts", "test")
+ path := filepath.Join(drivers.GetHomeDir(), ".docker", "machines", "test")
if _, err := os.Stat(path); os.IsNotExist(err) {
t.Fatalf("Host path doesn't exist: %s", path)
}
@@ -72,7 +72,7 @@ func TestStoreRemove(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- path := filepath.Join(drivers.GetHomeDir(), ".docker", "hosts", "test")
+ path := filepath.Join(drivers.GetHomeDir(), ".docker", "machines", "test")
if _, err := os.Stat(path); os.IsNotExist(err) {
t.Fatalf("Host path doesn't exist: %s", path)
}