Merge pull request #454 from ulyssessouza/remove-namespace-from-metadata

simonferquel · web-flow · commit abd6c9b532dc · 2019-02-20T15:38:06.000+01:00
Remove the notion of namespace
diff --git a/cmd/docker-app/bundle.go b/cmd/docker-app/bundle.go
@@ -21,9 +21,7 @@ import (
 )
 
 type bundleOptions struct {
-	invocationImageName string
-	namespace           string
-	out                 string
+	out string
 }
 
 func bundleCmd(dockerCli command.Cli) *cobra.Command {
@@ -37,14 +35,12 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.invocationImageName, "invocation-image", "i", "", "specify the name of invocation image to build")
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")
 	cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")
 	return cmd
 }
 
 func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error {
-	bundle, err := makeBundle(dockerCli, appName, opts.namespace, opts.invocationImageName)
+	bundle, err := makeBundle(dockerCli, appName)
 	if err != nil {
 		return err
 	}
@@ -63,22 +59,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error
 	return ioutil.WriteFile(opts.out, bundleBytes, 0644)
 }
 
-func makeBundle(dockerCli command.Cli, appName, namespace, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundle(dockerCli command.Cli, appName string) (*bundle.Bundle, error) {
 	app, err := packager.Extract(appName)
 	if err != nil {
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, namespace, invocationImageName)
+	return makeBundleFromApp(dockerCli, app)
 }
 
-func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundleFromApp(dockerCli command.Cli, app *types.App) (*bundle.Bundle, error) {
 	meta := app.Metadata()
-	invocationImageName, err := makeImageName(meta, namespace, invocationImageName, "-invoc")
+	invocationImageName, err := makeImageName(meta)
 	if err != nil {
 		return nil, err
 	}
-	if _, err := makeImageName(app.Metadata(), namespace, "", ""); err != nil {
+	if _, err := makeImageName(meta); err != nil {
 		return nil, err
 	}
 
@@ -102,18 +98,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocat
 	return packager.ToCNAB(app, invocationImageName)
 }
 
-func makeImageName(meta metadata.AppMetadata, namespace, name, suffix string) (string, error) {
-	if name == "" {
-		name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)
-	}
-	if namespace == "" {
-		namespace = meta.Namespace
-	}
-	if namespace != "" {
-		name = fmt.Sprintf("%s/%s", namespace, name)
-	}
+func makeImageName(meta metadata.AppMetadata) (string, error) {
+	name := fmt.Sprintf("%s:%s-invoc", meta.Name, meta.Version)
 	if _, err := reference.ParseNormalizedNamed(name); err != nil {
-		return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)
+		return "", errors.Wrapf(err, "image name %q is invalid, please check name and version fields", name)
 	}
 	return name, nil
 }
diff --git a/cmd/docker-app/bundle_test.go b/cmd/docker-app/bundle_test.go
@@ -9,46 +9,16 @@ import (
 
 func TestMakeInvocationImage(t *testing.T) {
 	testcases := []struct {
-		name      string
-		imageName string
-		namespace string
-		meta      metadata.AppMetadata
-		expected  string
-		err       string
+		name     string
+		meta     metadata.AppMetadata
+		expected string
+		err      string
 	}{
-		{
-			name:      "specify-image-name",
-			imageName: "my-invocation-image",
-			expected:  "my-invocation-image",
-		},
-		{
-			name:      "specify-image-name-and-namespace",
-			imageName: "my-invocation-image",
-			namespace: "my-namespace",
-			expected:  "my-namespace/my-invocation-image",
-		},
 		{
 			name:     "simple-metadata",
 			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
 			expected: "name:version-invoc",
 		},
-		{
-			name:      "simple-metadata-with-overridden-namespace",
-			namespace: "my-namespace",
-			meta:      metadata.AppMetadata{Name: "name", Version: "version"},
-			expected:  "my-namespace/name:version-invoc",
-		},
-		{
-			name:     "metadata-with-namespace",
-			meta:     metadata.AppMetadata{Name: "name", Version: "version", Namespace: "namespace"},
-			expected: "namespace/name:version-invoc",
-		},
-		{
-			name:      "metadata-with-namespace-and-overridden-namespace",
-			namespace: "my-namespace",
-			meta:      metadata.AppMetadata{Name: "name", Version: "version", Namespace: "namespace"},
-			expected:  "my-namespace/name:version-invoc",
-		},
 		{
 			name: "simple-metadata",
 			meta: metadata.AppMetadata{Name: "WrongName&%*", Version: "version"},
@@ -57,10 +27,10 @@ func TestMakeInvocationImage(t *testing.T) {
 	}
 	for _, c := range testcases {
 		t.Run(c.name, func(t *testing.T) {
-			actual, err := makeImageName(c.meta, c.namespace, c.imageName, "-invoc")
+			actual, err := makeImageName(c.meta)
 			if c.err != "" {
 				assert.ErrorContains(t, err, c.err)
-				assert.Equal(t, actual, "")
+				assert.Equal(t, actual, "", "On "+c.meta.Name)
 			} else {
 				assert.NilError(t, err)
 				assert.Equal(t, actual, c.expected)
diff --git a/cmd/docker-app/cnab.go b/cmd/docker-app/cnab.go
@@ -117,16 +117,16 @@ func getAppNameKind(name string) (string, nameKind) {
 	return name, nameKindFile
 }
 
-func extractAndLoadAppBasedBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundle, error) {
+func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {
 	app, err := packager.Extract(name)
 	if err != nil {
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, namespace, "")
+	return makeBundleFromApp(dockerCli, app)
 }
 
-func resolveBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundle, error) {
+func resolveBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {
 	// resolution logic:
 	// - if there is a docker-app package in working directory, or an http:// / https:// prefix, use packager.Extract result
 	// - the name has a .json or .cnab extension and refers to an existing file or web resource: load the bundle
@@ -136,11 +136,11 @@ func resolveBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundl
 	switch kind {
 	case nameKindFile:
 		if strings.HasSuffix(name, internal.AppExtension) {
-			return extractAndLoadAppBasedBundle(dockerCli, namespace, name)
+			return extractAndLoadAppBasedBundle(dockerCli, name)
 		}
 		return loader.NewDetectingLoader().Load(name)
 	case nameKindDir, nameKindEmpty:
-		return extractAndLoadAppBasedBundle(dockerCli, namespace, name)
+		return extractAndLoadAppBasedBundle(dockerCli, name)
 	case nameKindReference:
 		// TODO: pull the bundle
 		fmt.Fprintln(dockerCli.Err(), "WARNING: pulling a CNAB is not yet supported")
diff --git a/cmd/docker-app/inspect.go b/cmd/docker-app/inspect.go
@@ -28,7 +28,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			bundle, err := resolveBundle(dockerCli, "", appname)
+			bundle, err := resolveBundle(dockerCli, appname)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/docker-app/install.go b/cmd/docker-app/install.go
@@ -17,7 +17,6 @@ type installOptions struct {
 	parametersOptions
 	credentialOptions
 	orchestrator     string
-	namespace        string
 	kubeNamespace    string
 	stackName        string
 	insecure         bool
@@ -58,7 +57,6 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVarP(&opts.orchestrator, "orchestrator", "o", "", "Orchestrator to install on (swarm, kubernetes)")
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
 	cmd.Flags().StringVar(&opts.kubeNamespace, "kubernetes-namespace", "default", "Kubernetes namespace to install into")
 	cmd.Flags().StringVar(&opts.stackName, "name", "", "Installation name (defaults to application name)")
 	cmd.Flags().BoolVar(&opts.insecure, "insecure", false, "Use insecure registry, without SSL")
@@ -74,7 +72,7 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
 	}
 	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
 
-	bndl, err := resolveBundle(dockerCli, opts.namespace, appname)
+	bndl, err := resolveBundle(dockerCli, appname)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/docker-app/push.go b/cmd/docker-app/push.go
@@ -9,9 +9,7 @@ import (
 )
 
 type pushOptions struct {
-	namespace string
-	tag       string
-	repo      string
+	tag string
 }
 
 func pushCmd() *cobra.Command {
@@ -26,15 +24,13 @@ func pushCmd() *cobra.Command {
 				return err
 			}
 			defer app.Cleanup()
-			dgst, err := packager.Push(app, opts.namespace, opts.tag, opts.repo)
+			dgst, err := packager.Push(app, opts.tag)
 			if err == nil {
 				fmt.Println(dgst)
 			}
 			return err
 		},
 	}
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
-	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")
-	cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")
+	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default is : from metadata)")
 	return cmd
 }
diff --git a/cmd/docker-app/upgrade.go b/cmd/docker-app/upgrade.go
@@ -15,7 +15,6 @@ type upgradeOptions struct {
 	parametersOptions
 	credentialOptions
 	bundleOrDockerApp string
-	namespace         string
 	insecure          bool
 }
 
@@ -32,7 +31,6 @@ func upgradeCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVar(&opts.bundleOrDockerApp, "bundle", "", "Override with new bundle or Docker App")
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
 	cmd.Flags().BoolVar(&opts.insecure, "insecure", false, "Use insecure registry, without SSL")
 
 	return cmd
@@ -49,7 +47,7 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
 	}
 
 	if opts.bundleOrDockerApp != "" {
-		b, err := resolveBundle(dockerCli, opts.namespace, opts.bundleOrDockerApp)
+		b, err := resolveBundle(dockerCli, opts.bundleOrDockerApp)
 		if err != nil {
 			return err
 		}
diff --git a/e2e/commands_test.go b/e2e/commands_test.go
@@ -86,8 +86,6 @@ version: 0.1.0
 name: app-test
 # A short description of the application
 description: my cool app
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-#namespace: myhubusername
 # List of application maintainers with name and email for each
 maintainers:
   - name: bob
@@ -243,10 +241,10 @@ func TestBundle(t *testing.T) {
 
 	// List the images on the build context daemon and checks the invocation image is there
 	cmd.Command = []string{dockerCli, "image", "ls", "--format", "{{.Repository}}:{{.Tag}}"}
-	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "acmecorp/simple:1.1.0-beta1-invoc"})
+	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "simple:1.1.0-beta1-invoc"})
 
 	// Copy all the files from the invocation image and check them
-	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "acmecorp/simple:1.1.0-beta1-invoc"}
+	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "simple:1.1.0-beta1-invoc"}
 	id := strings.TrimSpace(icmd.RunCmd(cmd).Assert(t, icmd.Success).Stdout())
 	cmd.Command = []string{dockerCli, "cp", "invocation:/cnab/app/simple.dockerapp", tmpDir.Join("simple.dockerapp")}
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
diff --git a/e2e/testdata/init-singlefile.dockerapp b/e2e/testdata/init-singlefile.dockerapp
@@ -5,8 +5,6 @@ version: 0.1.0
 name: tac
 # A short description of the application
 description: my cool app
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-#namespace: myhubusername
 # List of application maintainers with name and email for each
 maintainers:
   - name: bob
diff --git a/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml b/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml
@@ -1,7 +1,6 @@
 version: 0.1.0
 name: myapp
 description: ""
-namespace: "alice"
 maintainers:
   - name: bearclaw
     email: bearclaw@bearclaw.bearclaw
diff --git a/e2e/testdata/simple-bundle.json.golden b/e2e/testdata/simple-bundle.json.golden
@@ -1,5 +1,5 @@
 {
-	"name": "acmecorp/simple",
+	"name": "simple",
 	"version": "1.1.0-beta1",
 	"description": "new fancy webapp with microservices",
 	"maintainers": [
@@ -17,7 +17,7 @@
 	"invocationImages": [
 		{
 			"imageType": "docker",
-			"image": "acmecorp/simple:1.1.0-beta1-invoc"
+			"image": "simple:1.1.0-beta1-invoc"
 		}
 	],
 	"images": {
diff --git a/e2e/testdata/simple/simple.dockerapp/metadata.yml b/e2e/testdata/simple/simple.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 1.1.0-beta1
 name: simple
-namespace: acmecorp
 description: "new fancy webapp with microservices"
 maintainers:
   - name: John Developer
diff --git a/examples/voting-app/voting-app.dockerapp/metadata.yml b/examples/voting-app/voting-app.dockerapp/metadata.yml
@@ -4,8 +4,6 @@ version: 0.1.0
 name: voting-app
 # A short description of the application
 description: "Dogs or cats?"
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-namespace: myhubusername
 # List of application maintainers with name and email for each
 maintainers:
   - name: user
diff --git a/internal/config.go b/internal/config.go
@@ -4,5 +4,5 @@ var (
 	// Experimental enables experimental features if set to "on"
 	Experimental = "on"
 	// MetadataVersion defines the current schema version
-	MetadataVersion = "v0.1"
+	MetadataVersion = "v0.2"
 )
diff --git a/internal/packager/cnab.go b/internal/packager/cnab.go
@@ -1,8 +1,6 @@
 package packager
 
 import (
-	"fmt"
-
 	"github.com/deislabs/duffle/pkg/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/compose"
@@ -56,10 +54,6 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 			Name:  m.Name,
 		})
 	}
-	name := app.Metadata().Name
-	if app.Metadata().Namespace != "" {
-		name = fmt.Sprintf("%s/%s", app.Metadata().Namespace, name)
-	}
 
 	bundleImages, err := extractBundleImages(app.Composes())
 	if err != nil {
@@ -82,7 +76,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 			},
 		},
 		Maintainers: maintainers,
-		Name:        name,
+		Name:        app.Metadata().Name,
 		Version:     app.Metadata().Version,
 		Parameters:  parameters,
 		Actions: map[string]bundle.Action{
diff --git a/internal/packager/cnab_test.go b/internal/packager/cnab_test.go
@@ -17,7 +17,7 @@ func TestToCNAB(t *testing.T) {
 	assert.NilError(t, err)
 	expected := &bundle.Bundle{
 		Description: "hello",
-		Name:        "my-namespace/packing",
+		Name:        "packing",
 		Maintainers: []bundle.Maintainer{
 			{Name: "bearclaw", Email: "bearclaw@bearclaw.com"},
 			{Name: "bob", Email: "bob@bob.com"},
diff --git a/internal/packager/init.go b/internal/packager/init.go
@@ -190,8 +190,6 @@ version: {{ .Version }}
 name: {{ .Name }}
 # A short description of the application
 description: {{ .Description }}
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-{{ if len .Namespace}}namespace: {{ .Namespace }} {{ else }}#namespace: myhubusername{{ end }}
 # List of application maintainers with name and email for each
 {{ if len .Maintainers }}maintainers:
 {{ range .Maintainers }}  - name: {{ .Name  }}
diff --git a/internal/packager/init_test.go b/internal/packager/init_test.go
@@ -106,8 +106,6 @@ version: 0.1.0
 name: writemetadata_test
 # A short description of the application
 description: 
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-#namespace: myhubusername
 # List of application maintainers with name and email for each
 maintainers:
   - name: bearclaw
diff --git a/internal/packager/registry.go b/internal/packager/registry.go
diff --git a/internal/packager/testdata/packages/packing.dockerapp/metadata.yml b/internal/packager/testdata/packages/packing.dockerapp/metadata.yml
diff --git a/specification/bindata.go b/specification/bindata.go
diff --git a/specification/schema_test.go b/specification/schema_test.go
diff --git a/specification/schemas/metadata_schema_v0.1.json b/specification/schemas/metadata_schema_v0.1.json
diff --git a/specification/schemas/metadata_schema_v0.2.json b/specification/schemas/metadata_schema_v0.2.json
diff --git a/types/metadata/load_test.go b/types/metadata/load_test.go
diff --git a/types/metadata/metadata.go b/types/metadata/metadata.go
diff --git a/types/types_test.go b/types/types_test.go

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,7 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type bundleOptions struct {`
`24`		`- invocationImageName string`
`25`		`- namespace string`
`26`		`- out string`
	`24`	`+ out string`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`func bundleCmd(dockerCli command.Cli) *cobra.Command {`
`@@ -37,14 +35,12 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {`
`37`	`35`	`},`
`38`	`36`	`}`
`39`	`37`
`40`		`- cmd.Flags().StringVarP(&opts.invocationImageName, "invocation-image", "i", "", "specify the name of invocation image to build")`
`41`		`- cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")`
`42`	`38`	`cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")`
`43`	`39`	`return cmd`
`44`	`40`	`}`
`45`	`41`
`46`	`42`	`func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error {`
`47`		`- bundle, err := makeBundle(dockerCli, appName, opts.namespace, opts.invocationImageName)`
	`43`	`+ bundle, err := makeBundle(dockerCli, appName)`
`48`	`44`	`if err != nil {`
`49`	`45`	`return err`
`50`	`46`	`}`
`@@ -63,22 +59,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error`
`63`	`59`	`return ioutil.WriteFile(opts.out, bundleBytes, 0644)`
`64`	`60`	`}`
`65`	`61`
`66`		`-func makeBundle(dockerCli command.Cli, appName, namespace, invocationImageName string) (*bundle.Bundle, error) {`
	`62`	`+func makeBundle(dockerCli command.Cli, appName string) (*bundle.Bundle, error) {`
`67`	`63`	`app, err := packager.Extract(appName)`
`68`	`64`	`if err != nil {`
`69`	`65`	`return nil, err`
`70`	`66`	`}`
`71`	`67`	`defer app.Cleanup()`
`72`		`- return makeBundleFromApp(dockerCli, app, namespace, invocationImageName)`
	`68`	`+ return makeBundleFromApp(dockerCli, app)`
`73`	`69`	`}`
`74`	`70`
`75`		`-func makeBundleFromApp(dockerCli command.Cli, app types.App, namespace, invocationImageName string) (bundle.Bundle, error) {`
	`71`	`+func makeBundleFromApp(dockerCli command.Cli, app types.App) (bundle.Bundle, error) {`
`76`	`72`	`meta := app.Metadata()`
`77`		`- invocationImageName, err := makeImageName(meta, namespace, invocationImageName, "-invoc")`
	`73`	`+ invocationImageName, err := makeImageName(meta)`
`78`	`74`	`if err != nil {`
`79`	`75`	`return nil, err`
`80`	`76`	`}`
`81`		`- if _, err := makeImageName(app.Metadata(), namespace, "", ""); err != nil {`
	`77`	`+ if _, err := makeImageName(meta); err != nil {`
`82`	`78`	`return nil, err`
`83`	`79`	`}`
`84`	`80`
`@@ -102,18 +98,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocat`
`102`	`98`	`return packager.ToCNAB(app, invocationImageName)`
`103`	`99`	`}`
`104`	`100`
`105`		`-func makeImageName(meta metadata.AppMetadata, namespace, name, suffix string) (string, error) {`
`106`		`- if name == "" {`
`107`		`- name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)`
`108`		`- }`
`109`		`- if namespace == "" {`
`110`		`- namespace = meta.Namespace`
`111`		`- }`
`112`		`- if namespace != "" {`
`113`		`- name = fmt.Sprintf("%s/%s", namespace, name)`
`114`		`- }`
	`101`	`+func makeImageName(meta metadata.AppMetadata) (string, error) {`
	`102`	`+ name := fmt.Sprintf("%s:%s-invoc", meta.Name, meta.Version)`
`115`	`103`	`if _, err := reference.ParseNormalizedNamed(name); err != nil {`
`116`		`- return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)`
	`104`	`+ return "", errors.Wrapf(err, "image name %q is invalid, please check name and version fields", name)`
`117`	`105`	`}`
`118`	`106`	`return name, nil`
`119`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {`
`28`	`28`	`if err != nil {`
`29`	`29`	`return err`
`30`	`30`	`}`
`31`		`- bundle, err := resolveBundle(dockerCli, "", appname)`
	`31`	`+ bundle, err := resolveBundle(dockerCli, appname)`
`32`	`32`	`if err != nil {`
`33`	`33`	`return err`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type pushOptions struct {`
`12`		`- namespace string`
`13`		`- tag string`
`14`		`- repo string`
	`12`	`+ tag string`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`func pushCmd() *cobra.Command {`
`@@ -26,15 +24,13 @@ func pushCmd() *cobra.Command {`
`26`	`24`	`return err`
`27`	`25`	`}`
`28`	`26`	`defer app.Cleanup()`
`29`		`- dgst, err := packager.Push(app, opts.namespace, opts.tag, opts.repo)`
	`27`	`+ dgst, err := packager.Push(app, opts.tag)`
`30`	`28`	`if err == nil {`
`31`	`29`	`fmt.Println(dgst)`
`32`	`30`	`}`
`33`	`31`	`return err`
`34`	`32`	`},`
`35`	`33`	`}`
`36`		`- cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")`
`37`		`- cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")`
`38`		`- cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")`
	`34`	`+ cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default is : from metadata)")`
`39`	`35`	`return cmd`
`40`	`36`	`}`