Adds Docker provider support

Co-authored-by: Julien Salleyron <julien@containo.us>

config/dyn_config.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"reflect"
 
 	traefiktls "github.com/containous/traefik/tls"
 )
@@ -29,6 +30,29 @@ type LoadBalancerService struct {
 	ResponseForwarding *ResponseForwarding `json:"forwardingResponse,omitempty" toml:",omitempty"`
 }
 
+// Mergeable tells if the given service is mergeable.
+func (l *LoadBalancerService) Mergeable(loadBalancer *LoadBalancerService) bool {
+	savedServers := l.Servers
+	defer func() {
+		l.Servers = savedServers
+	}()
+	l.Servers = nil
+
+	savedServersLB := loadBalancer.Servers
+	defer func() {
+		loadBalancer.Servers = savedServersLB
+	}()
+	loadBalancer.Servers = nil
+
+	return reflect.DeepEqual(l, loadBalancer)
+}
+
+// SetDefaults Default values for a LoadBalancerService.
+func (l *LoadBalancerService) SetDefaults() {
+	l.PassHostHeader = true
+	l.Method = "wrr"
+}
+
 // ResponseForwarding holds configuration for the forward of the response.
 type ResponseForwarding struct {
 	FlushInterval string `json:"flushInterval,omitempty" toml:",omitempty"`
@@ -41,10 +65,18 @@ type Stickiness struct {
 
 // Server holds the server configuration.
 type Server struct {
-	URL    string `json:"url"`
+	URL    string `json:"url" label:"-"`
+	Scheme string `toml:"-" json:"-"`
+	Port   string `toml:"-" json:"-"`
 	Weight int    `json:"weight"`
 }
 
+// SetDefaults Default values for a Server.
+func (s *Server) SetDefaults() {
+	s.Weight = 1
+	s.Scheme = "http"
+}
+
 // HealthCheck holds the HealthCheck configuration.
 type HealthCheck struct {
 	Scheme string `json:"scheme,omitempty" toml:",omitempty"`

config/middlewares.go

@@ -190,7 +190,7 @@ func (s *IPStrategy) Get() (ip.Strategy, error) {
 // IPWhiteList holds the ip white list configuration.
 type IPWhiteList struct {
 	SourceRange []string    `json:"sourceRange,omitempty"`
-	IPStrategy  *IPStrategy `json:"ipStrategy,omitempty"`
+	IPStrategy  *IPStrategy `json:"ipStrategy,omitempty" label:"allowEmpty"`
 }
 
 // MaxConn holds maximum connection configuration.
@@ -199,6 +199,11 @@ type MaxConn struct {
 	ExtractorFunc string `json:"extractorFunc,omitempty"`
 }
 
+// SetDefaults Default values for a MaxConn.
+func (m *MaxConn) SetDefaults() {
+	m.ExtractorFunc = "request.host"
+}
+
 // PassTLSClientCert holds the TLS client cert headers configuration.
 type PassTLSClientCert struct {
 	PEM  bool                      `description:"Enable header with escaped client pem" json:"pem"`
@@ -219,6 +224,11 @@ type RateLimit struct {
 	ExtractorFunc string `json:"extractorFunc,omitempty"`
 }
 
+// SetDefaults Default values for a MaxConn.
+func (r *RateLimit) SetDefaults() {
+	r.ExtractorFunc = "request.host"
+}
+
 // Redirect holds the redirection configuration of an entry point to another, or to an URL.
 type Redirect struct {
 	Regex       string `json:"regex,omitempty"`

config/static/static_config.go

@@ -11,7 +11,6 @@ import (
 	"github.com/containous/traefik/old/provider/boltdb"
 	"github.com/containous/traefik/old/provider/consul"
 	"github.com/containous/traefik/old/provider/consulcatalog"
-	"github.com/containous/traefik/old/provider/docker"
 	"github.com/containous/traefik/old/provider/dynamodb"
 	"github.com/containous/traefik/old/provider/ecs"
 	"github.com/containous/traefik/old/provider/etcd"
@@ -23,6 +22,7 @@ import (
 	"github.com/containous/traefik/old/provider/zk"
 	"github.com/containous/traefik/ping"
 	acmeprovider "github.com/containous/traefik/provider/acme"
+	"github.com/containous/traefik/provider/docker"
 	"github.com/containous/traefik/provider/file"
 	"github.com/containous/traefik/provider/rest"
 	"github.com/containous/traefik/tls"