From 1a3ed0cbeb39d309b3e420a305121433ca1ae6f5 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 27 Mar 2014 04:24:31 +0000 Subject: [PATCH] Fix commit and import when no repository is specified Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 097aef2ca938012a5b42e0032b30267e27a92265 Component: engine --- components/engine/api/client.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/engine/api/client.go b/components/engine/api/client.go index 1e6bf9d549..df3265a15a 100644 --- a/components/engine/api/client.go +++ b/components/engine/api/client.go @@ -1013,9 +1013,11 @@ func (cli *DockerCli) CmdImport(args ...string) error { } v := url.Values{} - //Check if the given image name can be resolved - if _, _, err := registry.ResolveRepositoryName(repository); err != nil { - return err + if repository != "" { + //Check if the given image name can be resolved + if _, _, err := registry.ResolveRepositoryName(repository); err != nil { + return err + } } v.Set("repo", repository) @@ -1469,8 +1471,10 @@ func (cli *DockerCli) CmdCommit(args ...string) error { } //Check if the given image name can be resolved - if _, _, err := registry.ResolveRepositoryName(repository); err != nil { - return err + if repository != "" { + if _, _, err := registry.ResolveRepositoryName(repository); err != nil { + return err + } } v := url.Values{}