From f4374f70396b6d2cbfb93d52008df4f0d91072ef Mon Sep 17 00:00:00 2001 From: Josh Dolitsky Date: Mon, 22 Apr 2019 00:57:56 -0500 Subject: [PATCH] upgrade to oras 0.4.0 Signed-off-by: Josh Dolitsky --- Gopkg.lock | 6 ++++-- Gopkg.toml | 2 +- pkg/registry/client.go | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 61facc9e4..a77aab51c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -242,7 +242,7 @@ version = "v1.1.1" [[projects]] - digest = "1:a841cef1b22bee47aa59c3d9cc4bca4f419c864b03012606fa5b67aef08eab5d" + digest = "1:82158435e282da9b23bb1188487fe1c68b17a54ed9dcd557ab6204782ad3ff92" name = "github.com/deislabs/oras" packages = [ "pkg/auth", @@ -251,7 +251,8 @@ "pkg/oras", ] pruneopts = "UT" - revision = "12b336a3ea9d5d048f6726adbfc0a8271e75e2a8" + revision = "9f7669048990b0d0c186985737e6a6c3bb3f7ecc" + version = "v0.4.0" [[projects]] digest = "1:76dc72490af7174349349838f2fe118996381b31ea83243812a97e5a0fd5ed55" @@ -1759,6 +1760,7 @@ "github.com/docker/distribution/registry", "github.com/docker/distribution/registry/auth/htpasswd", "github.com/docker/distribution/registry/storage/driver/inmemory", + "github.com/docker/docker/pkg/term", "github.com/docker/go-units", "github.com/evanphx/json-patch", "github.com/ghodss/yaml", diff --git a/Gopkg.toml b/Gopkg.toml index 662a196ee..7ea36e668 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -44,7 +44,7 @@ [[constraint]] name = "github.com/deislabs/oras" - revision = "12b336a3ea9d5d048f6726adbfc0a8271e75e2a8" + version = "0.4.0" [[constraint]] name = "github.com/docker/go-units" diff --git a/pkg/registry/client.go b/pkg/registry/client.go index 4867c9354..588961d02 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -92,7 +92,7 @@ func (c *Client) PushChart(ref *Reference) error { if err != nil { return err } - err = oras.Push(context.Background(), c.resolver, ref.String(), c.cache.store, layers) + _, err = oras.Push(context.Background(), c.resolver, ref.String(), c.cache.store, layers) if err != nil { return err } @@ -109,7 +109,7 @@ func (c *Client) PushChart(ref *Reference) error { func (c *Client) PullChart(ref *Reference) error { c.setDefaultTag(ref) fmt.Fprintf(c.out, "%s: Pulling from %s\n", ref.Tag, ref.Repo) - layers, err := oras.Pull(context.Background(), c.resolver, ref.String(), c.cache.store, KnownMediaTypes()...) + _, layers, err := oras.Pull(context.Background(), c.resolver, ref.String(), c.cache.store, oras.WithAllowedMediaTypes(KnownMediaTypes())) if err != nil { return err }