Merge pull request #227 from containous/fix-docker-network
Fix docker network
This commit is contained in:
commit
b42b170ad2
4 changed files with 20 additions and 8 deletions
|
@ -57,7 +57,7 @@ import:
|
||||||
- package: github.com/flynn/go-shlex
|
- package: github.com/flynn/go-shlex
|
||||||
ref: 3f9db97f856818214da2e1057f8ad84803971cff
|
ref: 3f9db97f856818214da2e1057f8ad84803971cff
|
||||||
- package: github.com/fsouza/go-dockerclient
|
- package: github.com/fsouza/go-dockerclient
|
||||||
ref: 0239034d42f665efa17fd77c39f891c2f9f32922
|
ref: a49c8269a6899cae30da1f8a4b82e0ce945f9967
|
||||||
- package: github.com/boltdb/bolt
|
- package: github.com/boltdb/bolt
|
||||||
ref: 51f99c862475898df9773747d3accd05a7ca33c1
|
ref: 51f99c862475898df9773747d3accd05a7ca33c1
|
||||||
- package: gopkg.in/mgo.v2
|
- package: gopkg.in/mgo.v2
|
||||||
|
|
|
@ -676,7 +676,11 @@ func TestDockerLoadDockerConfig(t *testing.T) {
|
||||||
Ports: map[docker.Port][]docker.PortBinding{
|
Ports: map[docker.Port][]docker.PortBinding{
|
||||||
"80/tcp": {},
|
"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{
|
Ports: map[docker.Port][]docker.PortBinding{
|
||||||
"80/tcp": {},
|
"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{
|
Ports: map[docker.Port][]docker.PortBinding{
|
||||||
"80/tcp": {},
|
"80/tcp": {},
|
||||||
},
|
},
|
||||||
IPAddress: "127.0.0.1",
|
Networks: map[string]docker.ContainerNetwork{
|
||||||
|
"bridgde": {
|
||||||
|
IPAddress: "127.0.0.1",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -31,9 +31,9 @@ git push --follow-tags -u origin master
|
||||||
|
|
||||||
# create docker image emilevauge/traefik (compatibility)
|
# create docker image emilevauge/traefik (compatibility)
|
||||||
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
|
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
|
||||||
docker push ${REPO,,}:latest
|
docker push emilevauge/traefik:latest
|
||||||
docker tag ${REPO,,}:latest ${REPO,,}:${VERSION}
|
docker tag emilevauge/traefik:latest emilevauge/traefik:${VERSION}
|
||||||
docker push ${REPO,,}:${VERSION}
|
docker push emilevauge/traefik:${VERSION}
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
rm -Rf traefik-library-image/
|
rm -Rf traefik-library-image/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[backends]{{range .Containers}}
|
[backends]{{range .Containers}}
|
||||||
[backends.backend-{{getBackend .}}.servers.server-{{.Name | replace "/" "" | replace "." "-"}}]
|
[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 .}}
|
weight = {{getWeight .}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue