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

fix: docker service name.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-09-26 12:26:05 +02:00 committed by Traefiker Bot
parent 29efac3e5e
commit c8fa059064
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/docker_compose_test.go
View file

@ -77,7 +77,7 @@ func (s *DockerComposeSuite) TestComposeScale(c *check.C) {
services := rtconf.Services services := rtconf.Services
c.Assert(services, checker.HasLen, 1) c.Assert(services, checker.HasLen, 1)
for k, v := range services { for k, v := range services {
c.Assert(k, checker.Equals, composeService+"_integrationtest"+composeProject+"@docker") c.Assert(k, checker.Equals, composeService+"-integrationtest"+composeProject+"@docker")
c.Assert(v.LoadBalancer.Servers, checker.HasLen, serviceCount) c.Assert(v.LoadBalancer.Servers, checker.HasLen, serviceCount)
// We could break here, but we don't just to keep us honest. // We could break here, but we don't just to keep us honest.
} }

2
pkg/provider/docker/config.go
View file

@ -331,5 +331,5 @@ func getServiceName(container dockerData) string {
serviceName = values[labelDockerComposeService] + "_" + values[labelDockerComposeProject] serviceName = values[labelDockerComposeService] + "_" + values[labelDockerComposeProject]
} }
return serviceName return provider.Normalize(serviceName)
} }

7
pkg/provider/docker/docker.go
View file

@ -142,7 +142,12 @@ func (p *Provider) createClient() (client.APIClient, error) {
apiVersion = SwarmAPIVersion apiVersion = SwarmAPIVersion
} }
return client.NewClient(p.Endpoint, apiVersion, httpClient, httpHeaders) return client.NewClientWithOpts(
client.WithHost(p.Endpoint),
client.WithVersion(apiVersion),
client.WithHTTPClient(httpClient),
client.WithHTTPHeaders(httpHeaders),
)
} }
// Provide allows the docker provider to provide configurations to traefik using the given configuration channel. // Provide allows the docker provider to provide configurations to traefik using the given configuration channel.