... | ... |
@@ -932,7 +932,7 @@ func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Requ |
932 | 932 |
} |
933 | 933 |
context = c |
934 | 934 |
} else if utils.IsURL(remoteURL) { |
935 |
- f, err := utils.Download(remoteURL, ioutil.Discard) |
|
935 |
+ f, err := utils.Download(remoteURL) |
|
936 | 936 |
if err != nil { |
937 | 937 |
return err |
938 | 938 |
} |
... | ... |
@@ -258,7 +258,7 @@ func (b *buildFile) CmdVolume(args string) error { |
258 | 258 |
} |
259 | 259 |
|
260 | 260 |
func (b *buildFile) addRemote(container *Container, orig, dest string) error { |
261 |
- file, err := utils.Download(orig, ioutil.Discard) |
|
261 |
+ file, err := utils.Download(orig) |
|
262 | 262 |
if err != nil { |
263 | 263 |
return err |
264 | 264 |
} |
... | ... |
@@ -443,7 +443,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer, sf *utils. |
443 | 443 |
return err |
444 | 444 |
} |
445 | 445 |
|
446 |
- file, err := utils.Download(url, out) |
|
446 |
+ file, err := utils.Download(url) |
|
447 | 447 |
if err != nil { |
448 | 448 |
return err |
449 | 449 |
} |
... | ... |
@@ -1248,7 +1248,7 @@ func (srv *Server) ImageImport(src, repo, tag string, in io.Reader, out io.Write |
1248 | 1248 |
out.Write(sf.FormatStatus("", "Downloading from %s", u)) |
1249 | 1249 |
// Download with curl (pretty progress bar) |
1250 | 1250 |
// If curl is not available, fallback to http.Get() |
1251 |
- resp, err = utils.Download(u.String(), out) |
|
1251 |
+ resp, err = utils.Download(u.String()) |
|
1252 | 1252 |
if err != nil { |
1253 | 1253 |
return err |
1254 | 1254 |
} |
... | ... |
@@ -45,7 +45,7 @@ func Go(f func() error) chan error { |
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
// Request a given URL and return an io.Reader |
48 |
-func Download(url string, stderr io.Writer) (*http.Response, error) { |
|
48 |
+func Download(url string) (*http.Response, error) { |
|
49 | 49 |
var resp *http.Response |
50 | 50 |
var err error |
51 | 51 |
if resp, err = http.Get(url); err != nil { |