35db73fa01
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. Upstream-commit: 0380fbff37922cadf294851b1546f4c212c7f364 Component: engine
49 lines
1.6 KiB
Go
49 lines
1.6 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/url"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/distribution/reference"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/pkg/system"
|
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
)
|
|
|
|
// ImageCreate creates a new image based in the parent options.
|
|
// It returns the JSON content in the response body.
|
|
func (cli *Client) ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error) {
|
|
ref, err := reference.ParseNormalizedNamed(parentReference)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
query := url.Values{}
|
|
query.Set("fromImage", reference.FamiliarName(ref))
|
|
query.Set("tag", getAPITagFromNamedRef(ref))
|
|
resp, err := cli.tryImageCreate(ctx, query, options.RegistryAuth, options.Platform)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return resp.body, nil
|
|
}
|
|
|
|
func (cli *Client) tryImageCreate(ctx context.Context, query url.Values, registryAuth string, platform specs.Platform) (serverResponse, error) {
|
|
headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
|
|
|
|
// TODO @jhowardmsft: system.IsPlatformEmpty is a temporary function. We need to move
|
|
// (in the reasonably short future) to a package which supports all the platform
|
|
// validation such as is proposed in https://github.com/containerd/containerd/pull/1403
|
|
if !system.IsPlatformEmpty(platform) {
|
|
platformJSON, err := json.Marshal(platform)
|
|
if err != nil {
|
|
return serverResponse{}, err
|
|
}
|
|
headers["X-Requested-Platform"] = []string{string(platformJSON[:])}
|
|
}
|
|
return cli.post(ctx, "/images/create", query, nil, headers)
|
|
}
|