0380fbff37
Signed-off-by: John Howard <jhoward@microsoft.com> This PR has the API changes described in https://github.com/moby/moby/issues/34617. Specifically, it adds an HTTP header "X-Requested-Platform" which is a JSON-encoded OCI Image-spec `Platform` structure. In addition, it renames (almost all) uses of a string variable platform (and associated) methods/functions to os. This makes it much clearer to disambiguate with the swarm "platform" which is really os/arch. This is a stepping stone to getting the daemon towards fully multi-platform/arch-aware, and makes it clear when "operating system" is being referred to rather than "platform" which is misleadingly used - sometimes in the swarm meaning, but more often as just the operating system.
137 lines
3.4 KiB
Go
137 lines
3.4 KiB
Go
package daemon
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"runtime"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/distribution/reference"
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/builder/dockerfile"
|
|
"github.com/docker/docker/builder/remotecontext"
|
|
"github.com/docker/docker/dockerversion"
|
|
"github.com/docker/docker/image"
|
|
"github.com/docker/docker/layer"
|
|
"github.com/docker/docker/pkg/archive"
|
|
"github.com/docker/docker/pkg/progress"
|
|
"github.com/docker/docker/pkg/streamformatter"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// ImportImage 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 (daemon *Daemon) ImportImage(src string, repository, os string, tag string, msg string, inConfig io.ReadCloser, outStream io.Writer, changes []string) error {
|
|
var (
|
|
rc io.ReadCloser
|
|
resp *http.Response
|
|
newRef reference.Named
|
|
)
|
|
|
|
// Default the operating system if not supplied.
|
|
if os == "" {
|
|
os = runtime.GOOS
|
|
}
|
|
|
|
if repository != "" {
|
|
var err error
|
|
newRef, err = reference.ParseNormalizedNamed(repository)
|
|
if err != nil {
|
|
return validationError{err}
|
|
}
|
|
if _, isCanonical := newRef.(reference.Canonical); isCanonical {
|
|
return validationError{errors.New("cannot import digest reference")}
|
|
}
|
|
|
|
if tag != "" {
|
|
newRef, err = reference.WithTag(newRef, tag)
|
|
if err != nil {
|
|
return validationError{err}
|
|
}
|
|
}
|
|
}
|
|
|
|
config, err := dockerfile.BuildFromConfig(&container.Config{}, changes)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if src == "-" {
|
|
rc = inConfig
|
|
} else {
|
|
inConfig.Close()
|
|
if len(strings.Split(src, "://")) == 1 {
|
|
src = "http://" + src
|
|
}
|
|
u, err := url.Parse(src)
|
|
if err != nil {
|
|
return validationError{err}
|
|
}
|
|
|
|
resp, err = remotecontext.GetWithStatusError(u.String())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
outStream.Write(streamformatter.FormatStatus("", "Downloading from %s", u))
|
|
progressOutput := streamformatter.NewJSONProgressOutput(outStream, true)
|
|
rc = progress.NewProgressReader(resp.Body, progressOutput, resp.ContentLength, "", "Importing")
|
|
}
|
|
|
|
defer rc.Close()
|
|
if len(msg) == 0 {
|
|
msg = "Imported from " + src
|
|
}
|
|
|
|
inflatedLayerData, err := archive.DecompressStream(rc)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
l, err := daemon.stores[os].layerStore.Register(inflatedLayerData, "", layer.OS(os))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer layer.ReleaseAndLog(daemon.stores[os].layerStore, l)
|
|
|
|
created := time.Now().UTC()
|
|
imgConfig, err := json.Marshal(&image.Image{
|
|
V1Image: image.V1Image{
|
|
DockerVersion: dockerversion.Version,
|
|
Config: config,
|
|
Architecture: runtime.GOARCH,
|
|
OS: os,
|
|
Created: created,
|
|
Comment: msg,
|
|
},
|
|
RootFS: &image.RootFS{
|
|
Type: "layers",
|
|
DiffIDs: []layer.DiffID{l.DiffID()},
|
|
},
|
|
History: []image.History{{
|
|
Created: created,
|
|
Comment: msg,
|
|
}},
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
id, err := daemon.stores[os].imageStore.Create(imgConfig)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// FIXME: connect with commit code and call refstore directly
|
|
if newRef != nil {
|
|
if err := daemon.TagImageWithReference(id, os, newRef); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
daemon.LogImageEvent(id.String(), id.String(), "import")
|
|
outStream.Write(streamformatter.FormatStatus("", id.String()))
|
|
return nil
|
|
}
|