Add support for Go template to -tags flag

VERSION

@@ -1 +1 @@
-v7
+v7.1.0

bridge/bridge.go

@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"bytes"
 	"errors"
 	"log"
 	"net"
@@ -11,6 +12,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"text/template"
 
 	dockerapi "github.com/fsouza/go-dockerclient"
 )
@@ -202,7 +204,7 @@ func (b *Bridge) add(containerId string, quiet bool) {
 
 	// Extract configured host port mappings, relevant when using --net=host
 	for port, _ := range container.Config.ExposedPorts {
-		published := []dockerapi.PortBinding{ {"0.0.0.0", port.Port()}, }
+		published := []dockerapi.PortBinding{{"0.0.0.0", port.Port()}}
 		ports[string(port)] = servicePort(container, port, published)
 	}
 
@@ -309,7 +311,7 @@ func (b *Bridge) newService(port ServicePort, isgroup bool) *Service {
 				service.IP = containerIp
 			}
 			log.Println("using container IP " + service.IP + " from label '" +
-				b.config.UseIpFromLabel  + "'")
+				b.config.UseIpFromLabel + "'")
 		} else {
 			log.Println("Label '" + b.config.UseIpFromLabel +
 				"' not found in container configuration")
@@ -332,13 +334,56 @@ func (b *Bridge) newService(port ServicePort, isgroup bool) *Service {
 		}
 	}
 
+	// Use container inspect data to populate tags list
+	// https://github.com/fsouza/go-dockerclient/blob/master/container.go#L441-L483
+	ForceTags := b.config.ForceTags
+	if len(ForceTags) != 0 {
+		// Template functions
+		fm := template.FuncMap{
+			"slice": func(v string, i ...int) string {
+				if len(i) == 1 {
+					if len(v) >= i[0] {
+						return v[i[0]:]
+					}
+				}
+
+				if len(i) == 2 {
+					if len(v) >= i[0] && len(v) >= i[1] {
+						if i[0] == 0 {
+							return v[:i[1]]
+						}
+						if i[1] < i[0] {
+							return v[i[0]:]
+						}
+						return v[i[0]:i[1]]
+					}
+				}
+
+				return v
+			},
+		}
+
+		tmpl, err := template.New("tags").Funcs(fm).Parse(ForceTags)
+		if err != nil {
+			log.Fatalf("%s template parsing failed with error: %s", ForceTags, err)
+		}
+
+		var b bytes.Buffer
+		err = tmpl.Execute(&b, container)
+		if err != nil {
+			log.Fatalf("%s template execution failed with error: %s", ForceTags, err)
+		}
+
+		ForceTags = b.String()
+	}
+
 	if port.PortType == "udp" {
 		service.Tags = combineTags(
-			mapDefault(metadata, "tags", ""), b.config.ForceTags, "udp")
+			mapDefault(metadata, "tags", ""), ForceTags, "udp")
 		service.ID = service.ID + ":udp"
 	} else {
 		service.Tags = combineTags(
-			mapDefault(metadata, "tags", ""), b.config.ForceTags)
+			mapDefault(metadata, "tags", ""), ForceTags)
 	}
 
 	id := mapDefault(metadata, "id", "")

registrator.go

@@ -25,7 +25,7 @@ var explicit = flag.Bool("explicit", false, "Only register containers which have
 var useIpFromLabel = flag.String("useIpFromLabel", "", "Use IP which is stored in a label assigned to the container")
 var refreshInterval = flag.Int("ttl-refresh", 0, "Frequency with which service TTLs are refreshed")
 var refreshTtl = flag.Int("ttl", 0, "TTL for services (default is no expiry)")
-var forceTags = flag.String("tags", "", "Append tags for all registered services")
+var forceTags = flag.String("tags", "", "Append tags for all registered services (supports Go template)")
 var resyncInterval = flag.Int("resync", 0, "Frequency with which services are resynchronized")
 var deregister = flag.String("deregister", "always", "Deregister exited services \"always\" or \"on-success\"")
 var retryAttempts = flag.Int("retry-attempts", 0, "Max retry attempts to establish a connection with the backend. Use -1 for infinite retries")