77cd22ea73
Importing an image currently logs an event with id:tag. This format is strange and nonstandard - possibly a mistake. Just log the ID instead. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
73 lines
1.8 KiB
Go
73 lines
1.8 KiB
Go
package graph
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/pkg/httputils"
|
|
"github.com/docker/docker/pkg/progressreader"
|
|
"github.com/docker/docker/pkg/streamformatter"
|
|
"github.com/docker/docker/runconfig"
|
|
)
|
|
|
|
// Import imports an image, getting the archived layer data either from
|
|
// inConfig (if src is "-"), or from a URI specified in src. Progress output is
|
|
// written to outStream. Repository and tag names can optionally be given in
|
|
// the repo and tag arguments, respectively.
|
|
func (s *TagStore) Import(src string, repo string, tag string, msg string, inConfig io.ReadCloser, outStream io.Writer, containerConfig *runconfig.Config) error {
|
|
var (
|
|
sf = streamformatter.NewJSONStreamFormatter()
|
|
archive io.ReadCloser
|
|
resp *http.Response
|
|
)
|
|
|
|
if src == "-" {
|
|
archive = inConfig
|
|
} else {
|
|
inConfig.Close()
|
|
u, err := url.Parse(src)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if u.Scheme == "" {
|
|
u.Scheme = "http"
|
|
u.Host = src
|
|
u.Path = ""
|
|
}
|
|
outStream.Write(sf.FormatStatus("", "Downloading from %s", u))
|
|
resp, err = httputils.Download(u.String())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
progressReader := progressreader.New(progressreader.Config{
|
|
In: resp.Body,
|
|
Out: outStream,
|
|
Formatter: sf,
|
|
Size: resp.ContentLength,
|
|
NewLines: true,
|
|
ID: "",
|
|
Action: "Importing",
|
|
})
|
|
archive = progressReader
|
|
}
|
|
|
|
defer archive.Close()
|
|
if len(msg) == 0 {
|
|
msg = "Imported from " + src
|
|
}
|
|
|
|
img, err := s.graph.Create(archive, "", "", msg, "", nil, containerConfig)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Optionally register the image at REPO/TAG
|
|
if repo != "" {
|
|
if err := s.Tag(repo, tag, img.ID, true); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
outStream.Write(sf.FormatStatus("", img.ID))
|
|
s.eventsService.Log("import", img.ID, "")
|
|
return nil
|
|
}
|