merge branch feat106-external-logo into internal

api/main.go

@@ -19,6 +19,7 @@ func main() {
 		swarm      = kingpin.Flag("swarm", "Swarm cluster support").Default("false").Short('s').Bool()
 		labels     = pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l'))
 		registries = pairs(kingpin.Flag("registries", "Supported Docker registries").Short('r'))
+		logo      = kingpin.Flag("logo", "URL for the logo displayed in the UI").String()
 	)
 	kingpin.Parse()
 
@@ -38,6 +39,7 @@ func main() {
 		Swarm:        *swarm,
 		HiddenLabels: *labels,
 		Registries:   *registries,
+		Logo:         *logo,
 	}
 
 	api := newAPI(apiConfig)

api/settings.go

@@ -10,6 +10,7 @@ type Settings struct {
 	Swarm        bool     `json:"swarm"`
 	HiddenLabels pairList `json:"hiddenLabels"`
 	Registries   pairList `json:"registries"`
+	Logo         string   `json:"logo"`
 }
 
 // configurationHandler defines a handler function used to encode the configuration in JSON