vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

cmd/dist: default mediatypes to oci and docker

Browse source 
To make using the `fetch-object` for demonstrations much easier, the
mediatypes are defaulted when a non-digest object identifier is
provided. We also add support for OCI mediatypes, although they are
mostly unavailable.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-03-02 16:50:32 -08:00
parent f09aadc9bf
commit ea9389d4c5
No known key found for this signature in database
GPG key ID: 67B3DED84EDC823F
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cmd/dist/fetchobject.go vendored
View file

@ -16,11 +16,17 @@ import (
"github.com/docker/containerd/log" "github.com/docker/containerd/log"
"github.com/docker/containerd/remotes" "github.com/docker/containerd/remotes"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/net/context/ctxhttp" "golang.org/x/net/context/ctxhttp"
) )
const (
MediaTypeDockerSchema2Manifest = "application/vnd.docker.distribution.manifest.v2+json"
MediaTypeDockerSchema2ManifestList = "application/vnd.docker.distribution.manifest.list.v2+json"
)
// TODO(stevvooe): Create "multi-fetch" mode that just takes a remote // TODO(stevvooe): Create "multi-fetch" mode that just takes a remote
// then receives object/hint lines on stdin, returning content as // then receives object/hint lines on stdin, returning content as
// needed. // needed.
@ -133,6 +139,14 @@ func getResolver(ctx contextpkg.Context) (remotes.Resolver, error) {
}, },
)) ))
if _, err := digest.Parse(object); err != nil {
// in this case, we are seeking a manifest by a tag. Let's add some hints.
hints = append(hints, "mediatype:"+MediaTypeDockerSchema2Manifest)
hints = append(hints, "mediatype:"+MediaTypeDockerSchema2ManifestList)
hints = append(hints, "mediatype:"+ocispec.MediaTypeImageManifest)
hints = append(hints, "mediatype:"+ocispec.MediaTypeImageIndex)
}
paths, err := getV2URLPaths(prefix, object, hints...) paths, err := getV2URLPaths(prefix, object, hints...)
if err != nil { if err != nil {
return nil, err return nil, err
@ -149,9 +163,7 @@ func getResolver(ctx contextpkg.Context) (remotes.Resolver, error) {
} }
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token)) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
for _, mediatype := range remotes.HintValues("mediatype", hints...) { req.Header.Set("Accept", strings.Join(remotes.HintValues("mediatype", hints...), ", "))
req.Header.Set("Accept", mediatype)
}
resp, err := ctxhttp.Do(ctx, http.DefaultClient, req) resp, err := ctxhttp.Do(ctx, http.DefaultClient, req)
if err != nil { if err != nil {
@ -227,18 +239,18 @@ func getV2URLPaths(prefix, object string, hints ...string) ([]string, error) {
// avoid having to do extra round trips to resolve content, as well as // avoid having to do extra round trips to resolve content, as well as
// avoid the tedium of providing media types. // avoid the tedium of providing media types.
if remotes.HintExists("mediatype", "application/vnd.docker.distribution.manifest.v2+json", hints...) { // TODO(stevvooe): make this handle oci types, as well. if remotes.HintExists("mediatype", MediaTypeDockerSchema2Manifest, hints...) ||
remotes.HintExists("mediatype", MediaTypeDockerSchema2ManifestList, hints...) ||
remotes.HintExists("mediatype", ocispec.MediaTypeImageManifest, hints...) ||
remotes.HintExists("mediatype", ocispec.MediaTypeImageIndex, hints...) {
// fast path out if we know we are getting a manifest. Arguably, we // fast path out if we know we are getting a manifest. Arguably, we
// should fallback to blobs, just in case. // should fallback to blobs, just in case.
urls = append(urls, path.Join("/v2", prefix, "manifests", object)) urls = append(urls, path.Join("/v2", prefix, "manifests", object))
} }
_, err := digest.Parse(object)
if err == nil {
// we have a digest, use blob or manifest path, depending on hints, may // we have a digest, use blob or manifest path, depending on hints, may
// need to try both. // need to try both.
urls = append(urls, path.Join("/v2", prefix, "blobs", object)) urls = append(urls, path.Join("/v2", prefix, "blobs", object))
}
// probably a take, so we go through the manifests endpoint // probably a take, so we go through the manifests endpoint
urls = append(urls, path.Join("/v2", prefix, "manifests", object)) urls = append(urls, path.Join("/v2", prefix, "manifests", object))