From 5c16860486826e38e0d0c27f40fef20bb8307594 Mon Sep 17 00:00:00 2001 From: tcoupin Date: Thu, 9 Mar 2017 22:27:09 +0100 Subject: [PATCH] Use service.project.domain instead of project-service.domain --- docs/toml.md | 2 +- provider/docker.go | 4 ++-- provider/docker_test.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/toml.md b/docs/toml.md index 574efd39a..e49f82e27 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -823,7 +823,7 @@ Labels can be used on containers to override default behaviour: - `traefik.protocol=https`: override the default `http` protocol - `traefik.weight=10`: assign this weight to the container - `traefik.enable=false`: disable this container in Træfɪk -- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}` or `Host:{project_name}-{service}.{domain}` if you are using `docker-compose`). +- `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}` or `Host:{service}.{project_name}.{domain}` if you are using `docker-compose`). - `traefik.frontend.passHostHeader=true`: forward client `Host` header to the backend. - `traefik.frontend.priority=10`: override default frontend priority - `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`. diff --git a/provider/docker.go b/provider/docker.go index 3c309d178..9cc57b17d 100644 --- a/provider/docker.go +++ b/provider/docker.go @@ -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) } diff --git a/provider/docker_test.go b/provider/docker_test.go index 4347ee79c..ac614ae1c 100644 --- a/provider/docker_test.go +++ b/provider/docker_test.go @@ -56,7 +56,7 @@ func TestDockerGetFrontendName(t *testing.T) { }, }, }, - expected: "Host-foo-bar-docker-localhost", + expected: "Host-bar-foo-docker-localhost", }, { container: docker.ContainerJSON{ @@ -159,7 +159,7 @@ func TestDockerGetFrontendRule(t *testing.T) { }, }, }, - expected: "Host:foo-bar.docker.localhost", + expected: "Host:bar.foo.docker.localhost", }, { container: docker.ContainerJSON{ @@ -235,7 +235,7 @@ func TestDockerGetBackend(t *testing.T) { }, }, }, - expected: "foo-bar", + expected: "bar-foo", }, }