From 0d13e91a62dbb046de548e3e1fd82c01dc4de1f7 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 6 Oct 2016 17:03:36 +0200 Subject: [PATCH 1/2] Remove duplicated link to Kubernetes.io in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fac43fbfa..74a832141 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Træfɪk is a modern HTTP reverse proxy and load balancer made to deploy microservices with ease. -It supports several backends ([Docker](https://www.docker.com/), [Swarm](https://docs.docker.com/swarm), [Kubernetes](http://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Mesos](https://github.com/apache/mesos), [Kubernetes](http://kubernetes.io/), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Zookeeper](https://zookeeper.apache.org), [BoltDB](https://github.com/boltdb/bolt), Rest API, file...) to manage its configuration automatically and dynamically. +It supports several backends ([Docker](https://www.docker.com/), [Swarm](https://docs.docker.com/swarm), [Kubernetes](http://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Mesos](https://github.com/apache/mesos), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Zookeeper](https://zookeeper.apache.org), [BoltDB](https://github.com/boltdb/bolt), Rest API, file...) to manage its configuration automatically and dynamically. ## Overview From 6ac1216f8c4800e01df1582fee209f7034fea3a3 Mon Sep 17 00:00:00 2001 From: Vincent Lepot Date: Fri, 7 Oct 2016 16:35:27 +0200 Subject: [PATCH 2/2] Fix networkMap construction (pointer always reference the last network found) --- provider/docker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/docker.go b/provider/docker.go index 50259d6bf..cd5ddc847 100644 --- a/provider/docker.go +++ b/provider/docker.go @@ -615,7 +615,8 @@ func listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerD return []dockerData{}, err } for _, network := range networkList { - networkMap[network.ID] = &network + networkToAdd := network + networkMap[network.ID] = &networkToAdd } var dockerDataList []dockerData