mirror of
https://github.com/clearlinux/docker.git
synced 2026-10-03 15:28:35 +00:00
Fix a regression in docker import on error from URL
when the daemon can't download the image from a `docker import` the error message was lost due to 'err' being redefined with a block by mistake. This removes the ":" from "... err := " which fixes it. Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
@@ -717,14 +717,17 @@ func (s *Server) postImagesCreate(version version.Version, w http.ResponseWriter
|
||||
OutStream: output,
|
||||
}
|
||||
|
||||
newConfig, err := builder.BuildFromConfig(s.daemon, &runconfig.Config{}, imageImportConfig.Changes)
|
||||
// 'err' MUST NOT be defined within this block, we need any error
|
||||
// generated from the download to be available to the output
|
||||
// stream processing below
|
||||
var newConfig *runconfig.Config
|
||||
newConfig, err = builder.BuildFromConfig(s.daemon, &runconfig.Config{}, imageImportConfig.Changes)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
imageImportConfig.ContainerConfig = newConfig
|
||||
|
||||
err = s.daemon.Repositories().Import(src, repo, tag, imageImportConfig)
|
||||
|
||||
}
|
||||
if err != nil {
|
||||
if !output.Flushed() {
|
||||
|
||||
Reference in New Issue
Block a user