Update dockerlib to support setting maintainers for individual images

Author: jsternberg

dockerlib/commands.go

@@ -35,8 +35,13 @@ func Update() error {
 	}
 
 	for _, m := range manifests {
+		if len(m.Maintainers) == 0 {
+			m.Maintainers = getDefaultMaintainers()
+		}
 		header := dockerlib.Header{}
-		header.Add("Maintainers", getDefaultMaintainer())
+		for _, maintainer := range m.Maintainers {
+			header.Add("Maintainers", maintainer)
+		}
 		header.Add("GitRepo", remoteRepo)
 
 		rev, err := latestRev(m.BaseDir)

dockerlib/dockerlib/header.go

@@ -46,9 +46,33 @@ func (h *Header) Set(key, value string) {
 func (h *Header) Write(w io.Writer) error {
 	for front := h.values.Front(); front != nil; front = front.Next() {
 		kv := front.Value.(*keyValuePair)
-		if _, err := fmt.Fprintf(w, "%s: %s\n", kv.key, strings.Join(kv.values, ", ")); err != nil {
+		if kv.key == "Maintainers" {
+			if err := h.writeMaintainers(w, kv.values); err != nil {
+				return err
+			}
+		} else if _, err := fmt.Fprintf(w, "%s: %s\n", kv.key, strings.Join(kv.values, ", ")); err != nil {
 			return err
 		}
 	}
 	return nil
 }
+
+func (h *Header) writeMaintainers(w io.Writer, values []string) error {
+	if _, err := fmt.Fprint(w, "Maintainers: "); err != nil {
+		return err
+	}
+	for i, value := range values {
+		if _, err := fmt.Fprintf(w, "%s", value); err != nil {
+			return err
+		}
+		if i < len(values)-1 {
+			if _, err := fmt.Fprint(w, ",\n             "); err != nil {
+				return err
+			}
+		}
+	}
+	if _, err := fmt.Fprintln(w); err != nil {
+		return err
+	}
+	return nil
+}

dockerlib/dockerlib/manifest.go

@@ -14,6 +14,7 @@ import (
 type ImageManifest struct {
 	Name          string     `json:"name"`
 	BaseDir       string     `json:"-"`
+	Maintainers   []string   `json:"maintainers"`
 	Versions      []*Version `json:"versions"`
 	Architectures []string   `json:"architectures"`
 	Variants      []*Variant `json:"variants"`

dockerlib/main.go

@@ -34,8 +34,8 @@ func fetchUpstream() error {
 	return nil
 }
 
-func getDefaultMaintainer() string {
-	return "Jonathan A. Sternberg <[email protected]> (@jsternberg)"
+func getDefaultMaintainers() []string {
+	return []string{"Jonathan A. Sternberg <[email protected]> (@jsternberg)"}
 }
 
 func main() {

telegraf/manifest.json

@@ -1,5 +1,9 @@
 {
   "name": "telegraf",
+  "maintainers": [
+    "Jonathan A. Sternberg <[email protected]> (@jsternberg)",
+    "Daniel Nelson <[email protected]> (@danielnelson)"
+  ],
   "versions": ["1.11", "1.12", "1.13"],
   "architectures": [
     "amd64",