Fix docker network

Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-02-27 13:04:33 +01:00 committed by Rebase Bot
parent a00eb81f03
commit defbb44b35
4 changed files with 20 additions and 8 deletions

View file

@ -57,7 +57,7 @@ import:
- package: github.com/flynn/go-shlex
ref: 3f9db97f856818214da2e1057f8ad84803971cff
- package: github.com/fsouza/go-dockerclient
ref: 0239034d42f665efa17fd77c39f891c2f9f32922
ref: a49c8269a6899cae30da1f8a4b82e0ce945f9967
- package: github.com/boltdb/bolt
ref: 51f99c862475898df9773747d3accd05a7ca33c1
- package: gopkg.in/mgo.v2

View file

@ -676,7 +676,11 @@ func TestDockerLoadDockerConfig(t *testing.T) {
Ports: map[docker.Port][]docker.PortBinding{
"80/tcp": {},
},
IPAddress: "127.0.0.1",
Networks: map[string]docker.ContainerNetwork{
"bridgde": {
IPAddress: "127.0.0.1",
},
},
},
},
},
@ -718,7 +722,11 @@ func TestDockerLoadDockerConfig(t *testing.T) {
Ports: map[docker.Port][]docker.PortBinding{
"80/tcp": {},
},
IPAddress: "127.0.0.1",
Networks: map[string]docker.ContainerNetwork{
"bridgde": {
IPAddress: "127.0.0.1",
},
},
},
},
{
@ -732,7 +740,11 @@ func TestDockerLoadDockerConfig(t *testing.T) {
Ports: map[docker.Port][]docker.PortBinding{
"80/tcp": {},
},
IPAddress: "127.0.0.1",
Networks: map[string]docker.ContainerNetwork{
"bridgde": {
IPAddress: "127.0.0.1",
},
},
},
},
},

View file

@ -31,9 +31,9 @@ git push --follow-tags -u origin master
# create docker image emilevauge/traefik (compatibility)
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
docker push ${REPO,,}:latest
docker tag ${REPO,,}:latest ${REPO,,}:${VERSION}
docker push ${REPO,,}:${VERSION}
docker push emilevauge/traefik:latest
docker tag emilevauge/traefik:latest emilevauge/traefik:${VERSION}
docker push emilevauge/traefik:${VERSION}
cd ..
rm -Rf traefik-library-image/

View file

@ -1,6 +1,6 @@
[backends]{{range .Containers}}
[backends.backend-{{getBackend .}}.servers.server-{{.Name | replace "/" "" | replace "." "-"}}]
url = "{{getProtocol .}}://{{.NetworkSettings.IPAddress}}:{{getPort .}}"
url = "{{getProtocol .}}://{{range $i := .NetworkSettings.Networks}}{{if $i}}{{.IPAddress}}{{end}}{{end}}:{{getPort .}}"
weight = {{getWeight .}}
{{end}}