Merge pull request #470 from simonferquel/push-pull-cnab-cleanup

Push/pull with cnab-to-oci

Author: chris-crone

Gopkg.lock

@@ -27,9 +27,18 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/opencontainers/runc"
   version = "v1.0.0-rc6"
 
+[[override]]
+  name = "github.com/docker/cnab-to-oci"
+  branch = "master"
+
+[[override]]
+  name = "github.com/containerd/containerd"
+  source = "github.com/simonferquel/containerd"
+  revision = "a89234684e5884e51ba195bdb16b1c6952d17f11"
+
 [[override]]
   name = "github.com/docker/cli"
-  revision = "f95ca8e1ba6c22c9abcdbf65e8dcc39c53958bba"
+  revision = "06b837a7d7e1115f3d2aa65c47765e25d4bf845b"
 
 [[override]]
   name = "github.com/deislabs/duffle"
@@ -57,7 +66,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/distribution"
-  revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
+  revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580"
 
 [[override]]
   name = "github.com/docker/swarmkit"

Gopkg.toml

@@ -70,13 +70,10 @@ func makeBundle(dockerCli command.Cli, appName string) (*bundle.Bundle, error) {
 
 func makeBundleFromApp(dockerCli command.Cli, app *types.App) (*bundle.Bundle, error) {
 	meta := app.Metadata()
-	invocationImageName, err := makeImageName(meta)
+	invocationImageName, err := makeInvocationImageName(meta)
 	if err != nil {
 		return nil, err
 	}
-	if _, err := makeImageName(meta); err != nil {
-		return nil, err
-	}
 
 	buildContext := bytes.NewBuffer(nil)
 	if err := packager.PackInvocationImageContext(app, buildContext); err != nil {
@@ -98,8 +95,12 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App) (*bundle.Bundle, e
 	return packager.ToCNAB(app, invocationImageName)
 }
 
-func makeImageName(meta metadata.AppMetadata) (string, error) {
-	name := fmt.Sprintf("%s:%s-invoc", meta.Name, meta.Version)
+func makeInvocationImageName(meta metadata.AppMetadata) (string, error) {
+	return makeCNABImageName(meta, "-invoc")
+}
+
+func makeCNABImageName(meta metadata.AppMetadata, suffix string) (string, error) {
+	name := fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)
 	if _, err := reference.ParseNormalizedNamed(name); err != nil {
 		return "", errors.Wrapf(err, "image name %q is invalid, please check name and version fields", name)
 	}

cmd/docker-app/bundle.go

@@ -27,7 +27,7 @@ func TestMakeInvocationImage(t *testing.T) {
 	}
 	for _, c := range testcases {
 		t.Run(c.name, func(t *testing.T) {
-			actual, err := makeImageName(c.meta)
+			actual, err := makeInvocationImageName(c.meta)
 			if c.err != "" {
 				assert.ErrorContains(t, err, c.err)
 				assert.Equal(t, actual, "", "On "+c.meta.Name)