From 331c7cd0d3bfc4a876f49c3831083dba027380c0 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Tue, 19 Feb 2013 13:03:58 -0800 Subject: [PATCH] dockerd: create /var/lib/docker if it doesn't exist Upstream-commit: 5e2f0639c64dc8a7ee5da81e0801bc4a17787407 Component: engine --- components/engine/docker.go | 2 +- components/engine/image/image.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/engine/docker.go b/components/engine/docker.go index 2b334976d7..abe2d3777d 100644 --- a/components/engine/docker.go +++ b/components/engine/docker.go @@ -107,7 +107,7 @@ func NewFromDirectory(root string) (*Docker, error) { containers: list.New(), } - if err := os.Mkdir(docker.repository, 0700); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(docker.repository, 0700); err != nil && !os.IsExist(err) { return nil, err } diff --git a/components/engine/image/image.go b/components/engine/image/image.go index 7f635d1338..82c88b2a05 100644 --- a/components/engine/image/image.go +++ b/components/engine/image/image.go @@ -27,6 +27,9 @@ func New(root string) (*Store, error) { if err != nil { return nil, err } + if err := os.MkdirAll(abspath, 0700); err != nil && !os.IsExist(err) { + return nil, err + } layers, err := NewLayerStore(path.Join(root, "layers")) if err != nil { return nil, err