From 8c14407fa2ab9a2598e4b2249d308aabda3c262a Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Tue, 24 Jan 2023 16:20:23 +0000 Subject: [PATCH] imagetools: silence intoto warnings Signed-off-by: Justin Chadwell (cherry picked from commit 7145e021f9d255a75c24d2561b813e387726dc04) --- util/imagetools/create.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/imagetools/create.go b/util/imagetools/create.go index aaa8379a..953ac9a4 100644 --- a/util/imagetools/create.go +++ b/util/imagetools/create.go @@ -11,6 +11,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/remotes" "github.com/docker/distribution/reference" "github.com/moby/buildkit/util/contentutil" "github.com/opencontainers/go-digest" @@ -151,8 +152,9 @@ func (r *Resolver) Combine(ctx context.Context, srcs []*Source) ([]byte, ocispec } func (r *Resolver) Push(ctx context.Context, ref reference.Named, desc ocispec.Descriptor, dt []byte) error { - ref = reference.TagNameOnly(ref) + ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto") + ref = reference.TagNameOnly(ref) p, err := r.resolver().Pusher(ctx, ref.String()) if err != nil { return err @@ -173,6 +175,8 @@ func (r *Resolver) Push(ctx context.Context, ref reference.Named, desc ocispec.D } func (r *Resolver) Copy(ctx context.Context, src *Source, dest reference.Named) error { + ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto") + dest = reference.TagNameOnly(dest) p, err := r.resolver().Pusher(ctx, dest.String()) if err != nil {