Adds Docker provider support

Co-authored-by: Julien Salleyron <julien@containo.us>
2019-01-18 15:18:04 +01:00 · 2019-01-18 15:18:04 +01:00 · b54c956c5e
commit b54c956c5e
parent 8735263930
78 changed files with 3476 additions and 5587 deletions
--- a/integration/resources/compose/access_log.yml
+++ b/integration/resources/compose/access_log.yml
@ -1,107 +1,79 @@
 server0:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend1
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Path:/test
+    - traefik.routers.rt-server0.entryPoints=http
+    - traefik.routers.rt-server0.rule=Path:/test
+    - traefik.services.service1.loadbalancer.server.port=80
 server1:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend1
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Host:frontend1.docker.local
+    - traefik.routers.rt-server1.entryPoints=http
+    - traefik.routers.rt-server1.rule=Host:frontend1.docker.local
+    - traefik.services.service1.loadbalancer.server.port=80
 server2:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend2
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Host:frontend2.docker.local
-    - traefik.frontend.passHostHeader=true
-    - backend.loadbalancer.method=drr
+    - traefik.routers.rt-server2.entryPoints=http
+    - traefik.routers.rt-server2.rule=Host:frontend2.docker.local
+    - traefik.services.service2.loadbalancer.server.port=80
+    - traefik.services.service2.loadbalancer.method=drr
 server3:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend2
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Host:frontend2.docker.local
-    - traefik.frontend.passHostHeader=true
-    - backend.loadbalancer.method=drr
+    - traefik.routers.rt-server3.entryPoints=http
+    - traefik.routers.rt-server3.rule=Host:frontend2.docker.local
+    - traefik.services.service2.loadbalancer.server.port=80
+    - traefik.services.service2.loadbalancer.method=drr
 authFrontend:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=httpFrontendAuth
-    - traefik.frontend.rule=Host:frontend.auth.docker.local
-    - traefik.frontend.auth.basic=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
-authEntrypoint:
-  image: emilevauge/whoami
+    - traefik.routers.rt-authFrontend.entryPoints=httpFrontendAuth
+    - traefik.routers.rt-authFrontend.rule=Host:frontend.auth.docker.local
+    - traefik.routers.rt-authFrontend.middlewares=basicauth
+    - traefik.middlewares.basicauth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
+    - traefik.services.service3.loadbalancer.server.port=80
+digestAuthMiddleware:
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=httpAuth
-    - traefik.frontend.rule=Host:entrypoint.auth.docker.local
-digestAuthEntrypoint:
-  image: emilevauge/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=digestAuth
-    - traefik.frontend.rule=Host:entrypoint.digest.auth.docker.local
-entrypointRedirect:
-  image: emilevauge/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=httpRedirect
-    - traefik.frontend.rule=Path:/test
+    - traefik.routers.rt-digestAuthMiddleware.entryPoints=digestAuth
+    - traefik.routers.rt-digestAuthMiddleware.rule=Host:entrypoint.digest.auth.docker.local
+    - traefik.routers.rt-digestAuthMiddleware.middlewares=digestauth
+    - traefik.middlewares.digestauth.digestauth.users=test:traefik:a2688e031edb4be6a3797f3882655c05, test2:traefik:518845800f9e2bfb1f1f740ec24f074e
+    - traefik.services.service3.loadbalancer.server.port=80
 frontendRedirect:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=frontendRedirect
-    - traefik.frontend.rule=Path:/test
-    - traefik.frontend.redirect.entryPoint=http
+    - traefik.routers.rt-frontendRedirect.entryPoints=frontendRedirect
+    - traefik.routers.rt-frontendRedirect.rule=Path:/test
+    - traefik.routers.rt-frontendRedirect.middlewares=redirecthttp
+    - traefik.middlewares.redirecthttp.redirect.regex=^(?:https?://)?([\w\._-]+)(?::\d+)?(.*)$$
+    - traefik.middlewares.redirecthttp.redirect.replacement=http://$${1}:8000$${2}
+    - traefik.services.service3.loadbalancer.server.port=80
 rateLimit:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=httpRateLimit
-    - traefik.frontend.rule=Host:ratelimit.docker.local
-    - traefik.frontend.rateLimit.extractorFunc=client.ip
-    - traefik.frontend.rateLimit.rateSet.powpow.period=3s
-    - traefik.frontend.rateLimit.rateSet.powpow.average=1
-    - traefik.frontend.rateLimit.rateSet.powpow.burst=2
-entrypointWhitelist:
-  image: emilevauge/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.entryPoints=httpWhitelistReject
-    - traefik.frontend.rule=Host:entrypoint.whitelist.docker.local
+    - traefik.routers.rt-rateLimit.entryPoints=httpRateLimit
+    - traefik.routers.rt-rateLimit.rule=Host:ratelimit.docker.local
+    - traefik.routers.rt-rateLimit.middlewares=rate
+    - traefik.middlewares.rate.ratelimit.extractorfunc=client.ip
+    - traefik.middlewares.rate.ratelimit.rateset.Rate0.average=1
+    - traefik.middlewares.rate.ratelimit.rateset.Rate0.burst=2
+    - traefik.middlewares.rate.ratelimit.rateset.Rate0.period=10s
+    - traefik.services.service3.loadbalancer.server.port=80
 frontendWhitelist:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend3
-    - traefik.frontend.whiteList.sourceRange=8.8.8.8/32
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Host:frontend.whitelist.docker.local
+    - traefik.routers.rt-frontendWhitelist.entryPoints=http
+    - traefik.routers.rt-frontendWhitelist.rule=Host:frontend.whitelist.docker.local
+    - traefik.routers.rt-frontendWhitelist.middlewares=wl
+    - traefik.middlewares.wl.ipwhitelist.sourcerange=8.8.8.8/32
+    - traefik.services.service3.loadbalancer.server.port=80
--- a/integration/resources/compose/addprefix.yml
+++ b/integration/resources/compose/addprefix.yml
@ -1,5 +1,5 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
    - traefik.frontend.rule=AddPrefix:/whoami;PathPrefix:/
--- a/integration/resources/compose/base.yml
+++ b/integration/resources/compose/base.yml
@ -1,11 +1,10 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.frontend.rule=PathPrefix:/whoami
-    - traefik.backend="test"
+    - traefik.routers.router1.rule=PathPrefix:/whoami

 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
-    - traefik.enable=false
+    - traefik.enable=false
--- a/integration/resources/compose/constraints.yml
+++ b/integration/resources/compose/constraints.yml
@ -12,6 +12,6 @@ consul:
    - "8302"
    - "8302/udp"
 whoami:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8881:80"
--- a/integration/resources/compose/consul.yml
+++ b/integration/resources/compose/consul.yml
@ -13,13 +13,13 @@ consul:
    - "8302/udp"

 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami3:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami4:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/consul_catalog.yml
+++ b/integration/resources/compose/consul_catalog.yml
@ -12,8 +12,8 @@ consul:
    - "8302"
    - "8302/udp"
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami
 whoami3:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/dynamodb.yml
+++ b/integration/resources/compose/dynamodb.yml
@ -7,10 +7,10 @@ dynamo:
    - "8000"

 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami3:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/etcd3.yml
+++ b/integration/resources/compose/etcd3.yml
@ -12,22 +12,22 @@ services:
      - 7001

  whoami1:
-    image: emilevauge/whoami
+    image: containous/whoami
    depends_on:
      - etcd

  whoami2:
-    image: emilevauge/whoami
+    image: containous/whoami
    depends_on:
      - whoami1

  whoami3:
-    image: emilevauge/whoami
+    image: containous/whoami
    depends_on:
      - whoami2

  whoami4:
-    image: emilevauge/whoami
+    image: containous/whoami
    depends_on:
      - whoami3

--- a/integration/resources/compose/eureka.yml
+++ b/integration/resources/compose/eureka.yml
@ -2,4 +2,4 @@ eureka:
  image: springcloud/eureka

 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/file.yml
+++ b/integration/resources/compose/file.yml
@ -1,20 +1,20 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8881:80"
 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8882:80"
 whoami3:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8883:80"
 whoami4:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8884:80"
 whoami5:
-  image: emilevauge/whoami
+  image: containous/whoami
  ports:
    - "8885:80"
--- a/integration/resources/compose/healthcheck.yml
+++ b/integration/resources/compose/healthcheck.yml
@ -1,5 +1,5 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami

 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/hostresolver.yml
+++ b/integration/resources/compose/hostresolver.yml
@ -1,8 +1,6 @@
 server1:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.backend=backend1
-    - traefik.frontend.entryPoints=http
-    - traefik.frontend.rule=Host:github.com
+    - traefik.services.service1.loadbalancer.server.port=80
+    - traefik.routers.router1.rule=Host:github.com
--- a/integration/resources/compose/minimal.yml
+++ b/integration/resources/compose/minimal.yml
@ -1,5 +1,6 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
  labels:
-    - traefik.frontend.rule=PathPrefix:/whoami
-    - traefik.enable=true
+    - traefik.Routers.RouterMini.Rule=PathPrefix:/whoami
+    - traefik.enable=true
+    
--- a/integration/resources/compose/proxy-protocol.yml
+++ b/integration/resources/compose/proxy-protocol.yml
@ -4,4 +4,4 @@ haproxy:
    - ../haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg

 whoami:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/ratelimit.yml
+++ b/integration/resources/compose/ratelimit.yml
@ -1,2 +1,2 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/reqacceptgrace.yml
+++ b/integration/resources/compose/reqacceptgrace.yml
@ -1,2 +1,2 @@
 whoami:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/retry.yml
+++ b/integration/resources/compose/retry.yml
@ -1,2 +1,2 @@
 whoami:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/stats.yml
+++ b/integration/resources/compose/stats.yml
@ -1,4 +1,4 @@
 whoami1:
-  image: emilevauge/whoami
+  image: containous/whoami
 whoami2:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/tlsclientheaders.yml
+++ b/integration/resources/compose/tlsclientheaders.yml
@ -2,5 +2,6 @@ whoami:
    image: containous/whoami
    labels:
      - traefik.frontend.passTLSClientCert.pem=true
-      - traefik.frontend.rule=PathPrefix:/
-
+      - traefik.routers.route1.rule=PathPrefix:/
+      - traefik.routers.route1.middlewares=passtls
+      - traefik.middlewares.passtls.passtlsclientcert.pem=true
--- a/integration/resources/compose/tracing.yml
+++ b/integration/resources/compose/tracing.yml
@ -20,4 +20,4 @@ jaeger:
    - "14268:14268"
    - "9411:9411"
 whoami:
-  image: emilevauge/whoami
+  image: containous/whoami
--- a/integration/resources/compose/whitelist.yml
+++ b/integration/resources/compose/whitelist.yml
@ -2,33 +2,33 @@ noOverrideWhitelist:
  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.frontend.rule=Host:no.override.whitelist.docker.local
-    - traefik.frontend.whiteList.sourceRange=8.8.8.8
+    - traefik.routers.rt1.rule=Host:no.override.whitelist.docker.local
+    - traefik.routers.rt1.middlewares=wl1
+    - traefik.middlewares.wl1.ipwhiteList.sourceRange=8.8.8.8

 overrideIPStrategyRemoteAddrWhitelist:
  image: containous/whoami
  labels:
    - traefik.enable=true
-    - traefik.port=80
-    - traefik.frontend.rule=Host:override.remoteaddr.whitelist.docker.local
-    - traefik.frontend.whiteList.sourceRange=8.8.8.8
-    - traefik.frontend.whiteList.ipStrategy=true
+    - traefik.routers.rt2.rule=Host:override.remoteaddr.whitelist.docker.local
+    - traefik.routers.rt2.middlewares=wl2
+    - traefik.middlewares.wl2.ipwhitelist.sourceRange=8.8.8.8
+    - traefik.middlewares.wl2.ipwhitelist.ipStrategy=true

 overrideIPStrategyDepthWhitelist:
  image: containous/whoami
  labels:
  - traefik.enable=true
-  - traefik.port=80
-  - traefik.frontend.rule=Host:override.depth.whitelist.docker.local
-  - traefik.frontend.whiteList.sourceRange=8.8.8.8
-  - traefik.frontend.whiteList.ipStrategy.depth=3
+  - traefik.routers.rt3.rule=Host:override.depth.whitelist.docker.local
+  - traefik.routers.rt3.middlewares=wl3
+  - traefik.middlewares.wl3.ipwhitelist.sourceRange=8.8.8.8
+  - traefik.middlewares.wl3.ipwhitelist.ipStrategy.depth=3

 overrideIPStrategyExcludedIPsWhitelist:
  image: containous/whoami
  labels:
  - traefik.enable=true
-  - traefik.port=80
-  - traefik.frontend.rule=Host:override.excludedips.whitelist.docker.local
-  - traefik.frontend.whiteList.sourceRange=8.8.8.8
-  - traefik.frontend.whiteList.ipStrategy.excludedIPs=10.0.0.1,10.0.0.2
+  - traefik.routers.rt4.rule=Host:override.excludedips.whitelist.docker.local
+  - traefik.routers.rt4.middlewares=wl4
+  - traefik.middlewares.wl4.ipwhitelist.sourceRange=8.8.8.8
+  - traefik.middlewares.wl4.ipwhitelist.ipStrategy.excludedIPs=10.0.0.1,10.0.0.2