homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add marathon directory subdomain

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-05-31 23:23:23 +02:00
parent 1a75a71ad6
commit 72f88e5c0f
No known key found for this signature in database
GPG key ID: D808B4C167352E59
4 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
provider/docker.go
View file

@ -236,7 +236,7 @@ func (provider *Docker) getFrontendRule(container dockertypes.ContainerJSON) str
if label, err := getLabel(container, "traefik.frontend.rule"); err == nil {
return label
}
return "Host:" + getEscapedName(container.Name) + "." + provider.Domain
return "Host:" + provider.getEscapedName(container.Name) + "." + provider.Domain
}
func (provider *Docker) getBackend(container dockertypes.ContainerJSON) string {
@ -349,3 +349,8 @@ func listContainers(dockerClient client.APIClient) ([]dockertypes.ContainerJSON,
}
return containersInspected, nil
}
// Escape beginning slash "/", convert all others to dash "-"
func (provider *Docker) getEscapedName(name string) string {
return strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1)
}

10
provider/marathon.go
View file

@ -3,6 +3,7 @@ package provider
import (
"errors"
"net/url"
"sort"
"strconv"
"strings"
"text/template"
@ -341,7 +342,7 @@ func (provider *Marathon) getFrontendRule(application marathon.Application) stri
if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil {
return label
}
return "Host:" + getEscapedName(application.ID) + "." + provider.Domain
return "Host:" + provider.getEscapedName(application.ID) + "." + provider.Domain
}
func (provider *Marathon) getBackend(task marathon.Task, applications []marathon.Application) string {
@ -359,3 +360,10 @@ func (provider *Marathon) getFrontendBackend(application marathon.Application) s
}
return replace("/", "-", application.ID)
}
func (provider *Marathon) getEscapedName(name string) string {
splitedName := strings.Split(strings.TrimPrefix(name, "/"), "/")
sort.Sort(sort.Reverse(sort.StringSlice(splitedName)))
reverseName := strings.Join(splitedName, ".")
return reverseName
}

5
provider/provider.go
View file

@ -85,11 +85,6 @@ func replace(s1 string, s2 string, s3 string) string {
return strings.Replace(s3, s1, s2, -1)
}
// Escape beginning slash "/", convert all others to dash "-"
func getEscapedName(name string) string {
return strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1)
}
func normalize(name string) string {
fargs := func(c rune) bool {
return !unicode.IsLetter(c) && !unicode.IsNumber(c)