Merge pull request #10446 from dmcgowan/defer-key-file-creation

Defer creation of trust key file until needed
Upstream-commit: d748ec31d5f89f4cbe363ac9b38310906bf2a9e0
Component: engine
This commit is contained in:
Jessie Frazelle
2015-01-29 15:23:35 -08:00
6 changed files with 24 additions and 60 deletions
@@ -383,6 +383,9 @@ func TestDaemonKeyMigration(t *testing.T) {
if err != nil {
t.Fatalf("Error generating private key: %s", err)
}
if err := os.MkdirAll(filepath.Join(os.Getenv("HOME"), ".docker"), 0755); err != nil {
t.Fatalf("Error creating .docker directory: %s", err)
}
if err := libtrust.SaveKey(filepath.Join(os.Getenv("HOME"), ".docker", "key.json"), k1); err != nil {
t.Fatalf("Error saving private key: %s", err)
}