homelab/traefik
1
0
Fork 0
Code Activity

Merge pull request #1061 from WTFKr0/replace_underscores_in_url

Browse source 
Replace underscores to dash in autogenerated urls (docker provider)
This commit is contained in:
Emile Vauge 2017-02-06 16:32:28 +01:00 • committed by GitHub
commit 28054a0be3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integration/docker_test.go
View file

@ -110,7 +110,7 @@ func (s *DockerSuite) TestDefaultDockerContainers(c *check.C) {
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("GET", "http://127.0.0.1:8000/version", nil) req, err := http.NewRequest("GET", "http://127.0.0.1:8000/version", nil)
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
req.Host = fmt.Sprintf("%s.docker.localhost", name) req.Host = fmt.Sprintf("%s.docker.localhost", strings.Replace(name, "_", "-", -1))
resp, err := client.Do(req) resp, err := client.Do(req)
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)

4
provider/docker.go
View file

@ -595,9 +595,9 @@ func parseContainer(container dockertypes.ContainerJSON) dockerData {
return dockerData return dockerData
} }
// Escape beginning slash "/", convert all others to dash "-" // Escape beginning slash "/", convert all others to dash "-", and convert underscores "_" to dash "-"
func (provider *Docker) getSubDomain(name string) string { func (provider *Docker) getSubDomain(name string) string {
return strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1) return strings.Replace(strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1), "_", "-", -1)
} }
func (provider *Docker) listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerData, error) { func (provider *Docker) listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerData, error) {