Merge pull request #571 from rumpl/chore-update-cnab-to-oci

Update cnab-to-oci

Author: Ulysses Souza

Gopkg.lock

@@ -33,8 +33,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/containerd/containerd"
-  source = "github.com/simonferquel/containerd"
-  revision = "42c3614d58767e96c1752977fed94d0b140a0173"
+  branch = "master"
 
 [[override]]
   name = "github.com/docker/cli"
@@ -106,7 +105,11 @@ required = ["github.com/wadey/gocovmerge"]
 [[override]]
   name = "gopkg.in/yaml.v2"
   source = "https://github.com/simonferquel/yaml"
-  revision="c86e64ed9581b7588e736f0c3e6ecc02cc22996e"
+  revision = "c86e64ed9581b7588e736f0c3e6ecc02cc22996e"
+
+[[override]]
+  name = "github.com/opencontainers/runtime-spec"
+  revision = "29686dbc5559d93fb1ef402eeda3e35c38d75af4"
 
 [[constraint]]
   name = "github.com/spf13/pflag"

Gopkg.toml

@@ -117,7 +117,7 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 		return errors.Wrapf(err, "pushing to %q", retag.invocationImageRef.String())
 	}
 
-	resolverConfig := remotes.NewResolverConfigFromDockerConfigFile(dockerCli.ConfigFile(), opts.registry.insecureRegistries...)
+	resolver := remotes.CreateResolver(dockerCli.ConfigFile(), opts.registry.insecureRegistries...)
 	var display fixupDisplay = &plainDisplay{out: os.Stdout}
 	if term.IsTerminal(os.Stdout.Fd()) {
 		display = &interactiveDisplay{out: os.Stdout}
@@ -129,13 +129,13 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 		fixupOptions = append(fixupOptions, remotes.WithComponentImagePlatforms(platforms))
 	}
 	// bundle fixup
-	err = remotes.FixupBundle(context.Background(), bndl, retag.cnabRef, resolverConfig, fixupOptions...)
+	err = remotes.FixupBundle(context.Background(), bndl, retag.cnabRef, resolver, fixupOptions...)
 
 	if err != nil {
 		return errors.Wrapf(err, "fixing up %q for push", retag.cnabRef)
 	}
 	// push bundle manifest
-	descriptor, err := remotes.Push(newMuteLogContext(), bndl, retag.cnabRef, resolverConfig.Resolver, true, withAppAnnotations)
+	descriptor, err := remotes.Push(newMuteLogContext(), bndl, retag.cnabRef, resolver, true, withAppAnnotations)
 	if err != nil {
 		return errors.Wrapf(err, "pushing to %q", retag.cnabRef)
 	}

internal/commands/push.go

@@ -72,7 +72,7 @@ func (b *bundleStore) LookupOrPullBundle(ref reference.Named, pullRef bool, conf
 			return nil, err
 		}
 	}
-	bndl, err := remotes.Pull(context.TODO(), reference.TagNameOnly(ref), remotes.NewResolverConfigFromDockerConfigFile(config, insecureRegistries...).Resolver)
+	bndl, err := remotes.Pull(context.TODO(), reference.TagNameOnly(ref), remotes.CreateResolver(config, insecureRegistries...))
 	if err != nil {
 		return nil, errors.Wrap(err, ref.String())
 	}