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

Use service.project.domain instead of project-service.domain

Browse source
This commit is contained in:
tcoupin 2017-03-09 22:27:09 +01:00 • committed by Emile Vauge
parent 0a7f9b5a71
commit 5c16860486
No known key found for this signature in database
GPG key ID: D808B4C167352E59
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
provider/docker.go
View file

@ -526,7 +526,7 @@ func (provider *Docker) getFrontendRule(container dockerData) string {
return label
}
if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil {
return "Host:" + provider.getSubDomain(labels["com.docker.compose.project"]+"_"+labels["com.docker.compose.service"]) + "." + provider.Domain
return "Host:" + provider.getSubDomain(labels["com.docker.compose.service"]+"."+labels["com.docker.compose.project"]) + "." + provider.Domain
}
return "Host:" + provider.getSubDomain(container.ServiceName) + "." + provider.Domain
@ -537,7 +537,7 @@ func (provider *Docker) getBackend(container dockerData) string {
return normalize(label)
}
if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil {
return normalize(labels["com.docker.compose.project"] + "_" + labels["com.docker.compose.service"])
return normalize(labels["com.docker.compose.service"] + "_" + labels["com.docker.compose.project"])
}
return normalize(container.ServiceName)
}