save, push: Use version and repository_prefix from metadata by default.

Signed-off-by: Matthieu Nottale <[email protected]>

Author: Matthieu Nottale

README.md

@@ -46,6 +46,7 @@ It should look like this:
 version: 0.1.0
 name: hello
 description: ""
+repository_prefix: ""
 maintainers:
 - name: yourusername
   email: ""

cmd/docker-app/push.go

@@ -17,13 +17,10 @@ func pushCmd() *cobra.Command {
 		Short: "Push the application to a registry",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if pushTag == "" {
-				pushTag = "latest"
-			}
 			return packager.Push(firstOrEmpty(args), pushPrefix, pushTag)
 		},
 	}
-	cmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use")
-	cmd.Flags().StringVarP(&pushTag, "tag", "t", "latest", "tag to use")
+	cmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use (default: repository_prefix in metadata)")
+	cmd.Flags().StringVarP(&pushTag, "tag", "t", "", "tag to use (default: version in metadata")
 	return cmd
 }

cmd/docker-app/save.go

@@ -17,13 +17,11 @@ func saveCmd() *cobra.Command {
 		Short: "Save the application as an image to the docker daemon(in preparation for push)",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if saveTag == "" {
-				saveTag = "latest"
-			}
-			return packager.Save(firstOrEmpty(args), savePrefix, saveTag)
+			_, err := packager.Save(firstOrEmpty(args), savePrefix, saveTag)
+			return err
 		},
 	}
-	cmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use")
-	cmd.Flags().StringVarP(&saveTag, "tag", "t", "latest", "tag to use")
+	cmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use (default: repository_prefix in metadata)")
+	cmd.Flags().StringVarP(&saveTag, "tag", "t", "", "tag to use (default: version in metadata)")
 	return cmd
 }

e2e/binary_test.go

@@ -134,6 +134,7 @@ func TestInitBinary(t *testing.T) {
 	meta := `version: 0.1.0
 name: app_test
 description: my cool app
+repository_prefix: ""
 maintainers:
 - name: bob
   email: ""

e2e/testdata/init-singlefile.dockerapp

@@ -2,6 +2,7 @@
 version: 0.1.0
 name: tac
 description: my cool app
+repository_prefix: ""
 maintainers:
 - name: bob
   email: ""

examples/hello-world/README.md

@@ -18,6 +18,7 @@ $ cat hello-world.dockerapp
 version: 0.1.0
 name: hello-world
 description: ""
+repository_prefix: ""
 maintainers:
 - name: dimrok
   email: ""

examples/hello-world/hello-world.dockerapp

@@ -4,6 +4,7 @@
 version: 0.1.0
 name: hello-world
 description: "Hello world!"
+repository_prefix: "myhubuser/"
 maintainers:
 - name: user
   email: "[email protected]"

packager/registry.go

@@ -12,21 +12,41 @@ import (
 	"strings"
 
 	"github.com/docker/lunchbox/constants"
+	"github.com/docker/lunchbox/types"
 	"github.com/docker/lunchbox/utils"
 	"github.com/pkg/errors"
+	yaml "gopkg.in/yaml.v2"
 )
 
 func appName(appname string) string {
 	return utils.AppNameFromDir(appname)
 }
 
-// Save saves an app to docker
-func Save(appname, prefix, tag string) error {
+// Save saves an app to docker and returns the image name.
+func Save(appname, prefix, tag string) (string, error) {
 	appname, cleanup, err := Extract(appname)
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer cleanup()
+	if prefix == "" || tag == "" {
+		metaFile := filepath.Join(appname, "metadata.yml")
+		metaContent, err := ioutil.ReadFile(metaFile)
+		if err != nil {
+			return "", err
+		}
+		var meta types.AppMetadata
+		err = yaml.Unmarshal(metaContent, &meta)
+		if err != nil {
+			return "", err
+		}
+		if tag == "" {
+			tag = meta.Version
+		}
+		if prefix == "" {
+			prefix = meta.RepositoryPrefix
+		}
+	}
 	dockerfile := `
 FROM scratch
 COPY / /
@@ -35,15 +55,16 @@ COPY / /
 	ioutil.WriteFile(df, []byte(dockerfile), 0644)
 	di := filepath.Join(appname, ".dockerignore")
 	ioutil.WriteFile(di, []byte("__Dockerfile-docker-app__\n.dockerignore"), 0644)
-	args := []string{"build", "-t", prefix + appName(appname) + constants.AppExtension + ":" + tag, "-f", df, appname}
+	imageName := prefix + appName(appname) + constants.AppExtension + ":" + tag
+	args := []string{"build", "-t", imageName, "-f", df, appname}
 	cmd := exec.Command("docker", args...)
 	output, err := cmd.CombinedOutput()
 	os.Remove(df)
 	os.Remove(di)
 	if err != nil {
 		fmt.Println(string(output))
 	}
-	return err
+	return imageName, err
 }
 
 // Load loads an app from docker
@@ -89,11 +110,11 @@ func Push(appname, prefix, tag string) error {
 		return err
 	}
 	defer cleanup()
-	err = Save(appname, prefix, tag)
+	imageName, err := Save(appname, prefix, tag)
 	if err != nil {
 		return err
 	}
-	cmd := exec.Command("docker", "push", prefix+appName(appname)+constants.AppExtension+":"+tag)
+	cmd := exec.Command("docker", "push", imageName)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		return errors.Wrapf(err, "error from docker push command: %s", string(output))

types/metadata.go

@@ -8,11 +8,12 @@ type Maintainer struct {
 
 // AppMetadata is the format of the data found inside the metadata.yml file
 type AppMetadata struct {
-	Version     string
-	Name        string
-	Description string
-	Maintainers []Maintainer
-	Targets     ApplicationTarget
+	Version          string
+	Name             string
+	Description      string
+	RepositoryPrefix string `yaml:"repository_prefix"`
+	Maintainers      []Maintainer
+	Targets          ApplicationTarget
 }
 
 // ApplicationTarget represents which platform(s) / orchestrator(s) the