diff options
author | Doug Davis <dug@us.ibm.com> | 2015-09-16 11:56:26 -0700 |
---|---|---|
committer | Doug Davis <dug@us.ibm.com> | 2015-09-16 16:16:42 -0700 |
commit | f7d4b4fe2b130a522dee847a657218806180fa52 (patch) | |
tree | 9f8be283c8b4e2108224fe67cb4b711a7f87252d /daemon/container_windows.go | |
parent | e0fee019ca4a961149ea9bb6210ed5a4c8c5ab17 (diff) | |
download | docker-f7d4b4fe2b130a522dee847a657218806180fa52.tar.gz |
Convert some "daemon" static error strings to the new errocode package format
Signed-off-by: Doug Davis <dug@us.ibm.com>
Diffstat (limited to 'daemon/container_windows.go')
-rw-r--r-- | daemon/container_windows.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/container_windows.go b/daemon/container_windows.go index f72b6bb72e..0d9609eea4 100644 --- a/daemon/container_windows.go +++ b/daemon/container_windows.go @@ -3,9 +3,9 @@ package daemon import ( - "fmt" "strings" + derr "github.com/docker/docker/api/errors" "github.com/docker/docker/daemon/execdriver" ) @@ -64,7 +64,7 @@ func populateCommand(c *Container, env []string) error { } } default: - return fmt.Errorf("invalid network mode: %s", c.hostConfig.NetworkMode) + return derr.ErrorCodeInvalidNetworkMode.WithArgs(c.hostConfig.NetworkMode) } pid := &execdriver.Pid{} @@ -90,22 +90,22 @@ func populateCommand(c *Container, env []string) error { var layerPaths []string img, err := c.daemon.graph.Get(c.ImageID) if err != nil { - return fmt.Errorf("Failed to graph.Get on ImageID %s - %s", c.ImageID, err) + return derr.ErrorCodeGetGraph.WithArgs(c.ImageID, err) } for i := img; i != nil && err == nil; i, err = c.daemon.graph.GetParent(i) { lp, err := c.daemon.driver.Get(i.ID, "") if err != nil { - return fmt.Errorf("Failed to get layer path from graphdriver %s for ImageID %s - %s", c.daemon.driver.String(), i.ID, err) + return derr.ErrorCodeGetLayer.WithArgs(c.daemon.driver.String(), i.ID, err) } layerPaths = append(layerPaths, lp) err = c.daemon.driver.Put(i.ID) if err != nil { - return fmt.Errorf("Failed to put layer path from graphdriver %s for ImageID %s - %s", c.daemon.driver.String(), i.ID, err) + return derr.ErrorCodePutLayer.WithArgs(c.daemon.driver.String(), i.ID, err) } } m, err := c.daemon.driver.GetMetadata(c.ID) if err != nil { - return fmt.Errorf("Failed to get layer metadata - %s", err) + return derr.ErrorCodeGetLayerMetadata.WithArgs(err) } layerFolder := m["dir"] |