save: Add labels 'com.docker.application' and 'maintainers'.

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

Author: Matthieu Nottale

packager/registry.go

@@ -29,28 +29,28 @@ func Save(appname, prefix, tag string) (string, error) {
 		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
-		}
+	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 := `
+	dockerfile := fmt.Sprintf(`
 FROM scratch
+LABEL com.docker.application=%s
+LABEL maintainers="%v"
 COPY / /
-`
+`, meta.Name, meta.Maintainers)
 	df := filepath.Join(appname, "__Dockerfile-docker-app__")
 	ioutil.WriteFile(df, []byte(dockerfile), 0644)
 	di := filepath.Join(appname, ".dockerignore")

renderer/inspect.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-	"strings"
 	"text/tabwriter"
 
 	"github.com/docker/lunchbox/packager"
@@ -48,11 +47,7 @@ func Inspect(appname string) error {
 	}
 	sort.Slice(settingsKeys, func(i, j int) bool { return settingsKeys[i] < settingsKeys[j] })
 	// build maintainers string
-	maintainers := ""
-	for _, m := range meta.Maintainers {
-		maintainers += m.Name + " <" + m.Email + ">, "
-	}
-	maintainers = strings.TrimSuffix(maintainers, ", ")
+	maintainers := meta.Maintainers.String()
 	fmt.Printf("%s %s\n", meta.Name, meta.Version)
 	if maintainers != "" {
 		fmt.Printf("Maintained by: %s\n", maintainers)

types/metadata.go

@@ -1,18 +1,40 @@
 package types
 
+import (
+	"fmt"
+	"strings"
+)
+
 // Maintainer represents one of the apps's maintainers
 type Maintainer struct {
 	Name  string
 	Email string
 }
 
+// Maintainers is a list of maintainers
+type Maintainers []Maintainer
+
+// String gives a string representation of a list of maintainers
+func (ms Maintainers) String() string {
+	res := make([]string, len(ms))
+	for i, m := range ms {
+		res[i] = m.String()
+	}
+	return strings.Join(res, ",")
+}
+
+// String gives a string representation of a maintainer
+func (m Maintainer) String() string {
+	return fmt.Sprintf("%s <%s>", m.Name, m.Email)
+}
+
 // AppMetadata is the format of the data found inside the metadata.yml file
 type AppMetadata struct {
 	Version          string
 	Name             string
 	Description      string
 	RepositoryPrefix string `yaml:"repository_prefix"`
-	Maintainers      []Maintainer
+	Maintainers      Maintainers
 	Targets          ApplicationTarget
 }