diff --git a/commands.go b/commands.go index 056bcbfb56..780ccc1e1e 100644 --- a/commands.go +++ b/commands.go @@ -1402,6 +1402,13 @@ func (cli *DockerCli) CmdRun(args ...string) error { body, statusCode, err := cli.call("POST", "/containers/create", config) //if image not found try to pull it if statusCode == 404 { + _, tag := utils.ParseRepositoryTag(config.Image) + if tag == "" { + tag = DEFAULTTAG + } + + fmt.Printf("Unable to find image '%s' (tag: %s) locally\n", config.Image, tag) + v := url.Values{} repos, tag := utils.ParseRepositoryTag(config.Image) v.Set("fromImage", repos) diff --git a/server.go b/server.go index f4e08dcad7..561d3c7cfe 100644 --- a/server.go +++ b/server.go @@ -828,7 +828,13 @@ func (srv *Server) ContainerCreate(config *Config) (string, error) { container, err := b.Create(config) if err != nil { if srv.runtime.graph.IsNotExist(err) { - return "", fmt.Errorf("No such image: %s", config.Image) + + _, tag := utils.ParseRepositoryTag(config.Image) + if tag == "" { + tag = DEFAULTTAG + } + + return "", fmt.Errorf("No such image: %s (tag: %s)", config.Image, tag) } return "", err }