Merge branch 'v1.4' into v1.5

provider/consul/consul_catalog_test.go

@@ -12,14 +12,6 @@ import (
 )
 
 func TestConsulCatalogGetFrontendRule(t *testing.T) {
-	provider := &CatalogProvider{
-		Domain:               "localhost",
-		Prefix:               "traefik",
-		FrontEndRule:         "Host:{{.ServiceName}}.{{.Domain}}",
-		frontEndRuleTemplate: template.New("consul catalog frontend rule"),
-	}
-	provider.setupFrontEndTemplate()
-
 	testCases := []struct {
 		desc     string
 		service  serviceUpdate
@@ -71,6 +63,14 @@ func TestConsulCatalogGetFrontendRule(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
+			provider := &CatalogProvider{
+				Domain:               "localhost",
+				Prefix:               "traefik",
+				FrontEndRule:         "Host:{{.ServiceName}}.{{.Domain}}",
+				frontEndRuleTemplate: template.New("consul catalog frontend rule"),
+			}
+			provider.setupFrontEndTemplate()
+
 			actual := provider.getFrontendRule(test.service)
 			assert.Equal(t, test.expected, actual)
 		})

provider/docker/docker.go

@@ -418,9 +418,9 @@ func getServiceNames(container dockerData) []string {
 // Extract backend from labels for a given service and a given docker container
 func getServiceBackend(container dockerData, serviceName string) string {
 	if value, ok := getContainerServiceLabel(container, serviceName, types.SuffixFrontendBackend); ok {
-		return container.ServiceName + "-" + value
+		return provider.Normalize(container.ServiceName + "-" + value)
 	}
-	return strings.TrimPrefix(container.ServiceName, "/") + "-" + getBackend(container) + "-" + provider.Normalize(serviceName)
+	return provider.Normalize(container.ServiceName + "-" + getBackend(container) + "-" + serviceName)
 }
 
 // Extract rule from labels for a given service and a given docker container

provider/docker/service_test.go

@@ -94,12 +94,22 @@ func TestDockerGetServiceBackend(t *testing.T) {
 			container: containerJSON(name("foo")),
 			expected:  "foo-foo-myservice",
 		},
+		{
+			container: containerJSON(name("foo.bar")),
+			expected:  "foo-bar-foo-bar-myservice",
+		},
 		{
 			container: containerJSON(labels(map[string]string{
 				types.LabelBackend: "another-backend",
 			})),
 			expected: "fake-another-backend-myservice",
 		},
+		{
+			container: containerJSON(labels(map[string]string{
+				types.LabelBackend: "another.backend",
+			})),
+			expected: "fake-another-backend-myservice",
+		},
 		{
 			container: containerJSON(labels(map[string]string{
 				"traefik.myservice.frontend.backend": "custom-backend",