Update cnab-to-oci to v0.3.0-beta1 and cnab schema version to 1.0.0

Allow to push all images from the push/fixup command

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

Gopkg.lock

@@ -42,7 +42,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cnab-to-oci"
-  version = "v0.1.0-beta2"
+  version = "v0.3.0-beta1"
 
 [[override]]
   name = "github.com/containerd/containerd"

Gopkg.toml

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "v1.0.0-WD",
+  "schemaVersion": "v1.0.0",
   "name": "cnab-parameters",
   "version": "0.1.0",
   "invocationImages": [

e2e/testdata/cnab-parameters/bundle.json

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "v1.0.0-WD",
+  "schemaVersion": "v1.0.0",
   "name": "cnab-with-docker-status",
   "version": "0.1.0",
   "invocationImages": [

e2e/testdata/cnab-with-docker-status/bundle.json

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "v1.0.0-WD",
+  "schemaVersion": "v1.0.0",
   "name": "cnab-with-standard-status",
   "version": "0.1.0",
   "invocationImages": [

e2e/testdata/cnab-with-standard-status/bundle.json

@@ -1,5 +1,5 @@
 {
-    "schemaVersion": "v1.0.0-WD",
+    "schemaVersion": "v1.0.0",
     "name": "cnab-without-status",
     "version": "0.1.0",
     "invocationImages": [

e2e/testdata/cnab-without-status/bundle.json

@@ -1,7 +1,7 @@
 {
     "name": "example-credentials",
     "version": "0.0.1",
-    "schemaVersion": "v1.0.0-WD",
+    "schemaVersion": "v1.0.0",
     "invocationImages": [
         {
         "imageType": "docker",

e2e/testdata/credential-install-bundle.json

@@ -1,7 +1,7 @@
 {
     "name": "hellohelm",
     "version": "0.1.0",
-    "schemaVersion": "v1.0.0-WD",
+    "schemaVersion": "v1.0.0",
     "invocationImages": [
         {
         "imageType": "docker",

examples/cnab-helm/bundle.json

@@ -128,7 +128,8 @@ func PullBundle(dockerCli command.Cli, bundleStore appstore.BundleStore, tagRef
 	if err != nil {
 		return nil, fmt.Errorf("could not retrieve insecure registries: %v", err)
 	}
-	bndl, err := remotes.Pull(log.WithLogContext(context.Background()), reference.TagNameOnly(tagRef), remotes.CreateResolver(dockerCli.ConfigFile(), insecureRegistries...))
+
+	bndl, _, err := remotes.Pull(log.WithLogContext(context.Background()), reference.TagNameOnly(tagRef), remotes.CreateResolver(dockerCli.ConfigFile(), insecureRegistries...))
 	if err != nil {
 		return nil, err
 	}

internal/cnab/cnab.go

@@ -153,12 +153,13 @@ func pushBundle(dockerCli command.Cli, opts pushOptions, bndl *bundle.Bundle, re
 		fixupOptions = append(fixupOptions, remotes.WithComponentImagePlatforms(platforms))
 	}
 	// bundle fixup
-	if err := remotes.FixupBundle(context.Background(), bndl, retag.cnabRef, resolver, fixupOptions...); err != nil {
+	relocationMap, 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
 	logrus.Debugf("Pushing the bundle %q", retag.cnabRef)
-	descriptor, err := remotes.Push(log.WithLogContext(context.Background()), bndl, retag.cnabRef, resolver, true, withAppAnnotations)
+	descriptor, err := remotes.Push(log.WithLogContext(context.Background()), bndl, relocationMap, retag.cnabRef, resolver, true, withAppAnnotations)
 	if err != nil {
 		return errors.Wrapf(err, "pushing to %q", retag.cnabRef)
 	}