From e60e955f90fc0cfba640bedd76ca4a78339d4fbe Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 10 Sep 2015 15:12:28 +0200 Subject: [PATCH] Docker corrections with long hostnames --- docker.go | 7 +++++-- docker.tmpl | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker.go b/docker.go index 738c6d3f5..ab1a18256 100644 --- a/docker.go +++ b/docker.go @@ -24,7 +24,7 @@ var DockerFuncMap = template.FuncMap{ return value } } - return container.Config.Hostname + return getHost(container) }, "getPort": func(container docker.Container) string { for key, value := range container.Config.Labels { @@ -37,6 +37,9 @@ var DockerFuncMap = template.FuncMap{ } return "" }, + "replace": func(s1 string, s2 string, s3 string) string { + return strings.Replace(s3, s1, s2, -1) + }, "getHost": getHost, } @@ -113,5 +116,5 @@ func getHost(container docker.Container) string { return value } } - return strings.TrimPrefix(container.Name, "/") + return strings.Replace(strings.Replace(container.Name, "/", "", -1), ".", "-", -1) } \ No newline at end of file diff --git a/docker.tmpl b/docker.tmpl index dcbee33e1..022e8f49c 100644 --- a/docker.tmpl +++ b/docker.tmpl @@ -1,5 +1,5 @@ [backends]{{range .Containers}} - [backends.backend-{{getBackend .}}.servers.server-{{.Name | replace "/"}}] + [backends.backend-{{getBackend .}}.servers.server-{{.Name | replace "/" "" | replace "." "-"}}] url = "http://{{.NetworkSettings.IPAddress}}:{{getPort .}}" {{end}}