test: upgrade docker-compose

Co-authored-by: Rémi Buisson <remi.buisson@traefik.io>
2021-11-25 10:10:06 +00:00 · 2021-11-25 10:10:06 +00:00 · 5a225b4196
commit 5a225b4196
parent 525a6cf5b2
81 changed files with 2094 additions and 1283 deletions
--- a/integration/resources/compose/access_log.yml
+++ b/integration/resources/compose/access_log.yml
@ -1,77 +1,91 @@
-server0:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-server0.entryPoints=web
-    - traefik.http.routers.rt-server0.rule=Path("/test")
-    - traefik.http.services.service1.loadbalancer.server.port=80
-server1:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-server1.entryPoints=web
-    - traefik.http.routers.rt-server1.rule=Host("frontend1.docker.local")
-    - traefik.http.routers.rt-server1.service=service1
-    - traefik.http.services.service1.loadbalancer.server.port=80
-server2:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-server2.entryPoints=web
-    - traefik.http.routers.rt-server2.rule=Host("frontend2.docker.local")
-    - traefik.http.services.service2.loadbalancer.server.port=80
-server3:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-server3.entryPoints=web
-    - traefik.http.routers.rt-server3.rule=Host("frontend2.docker.local")
-    - traefik.http.services.service2.loadbalancer.server.port=80
-authFrontend:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-authFrontend.entryPoints=httpFrontendAuth
-    - traefik.http.routers.rt-authFrontend.rule=Host("frontend.auth.docker.local")
-    - traefik.http.routers.rt-authFrontend.middlewares=basicauth
-    - traefik.http.middlewares.basicauth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
-    - traefik.http.services.service3.loadbalancer.server.port=80
-digestAuthMiddleware:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-digestAuthMiddleware.entryPoints=digestAuth
-    - traefik.http.routers.rt-digestAuthMiddleware.rule=Host("entrypoint.digest.auth.docker.local")
-    - traefik.http.routers.rt-digestAuthMiddleware.middlewares=digestauth
-    - traefik.http.middlewares.digestauth.digestauth.users=test:traefik:a2688e031edb4be6a3797f3882655c05, test2:traefik:518845800f9e2bfb1f1f740ec24f074e
-    - traefik.http.services.service3.loadbalancer.server.port=80
-frontendRedirect:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-frontendRedirect.entryPoints=frontendRedirect
-    - traefik.http.routers.rt-frontendRedirect.rule=Path("/test")
-    - traefik.http.routers.rt-frontendRedirect.middlewares=redirecthttp
-    - traefik.http.middlewares.redirecthttp.redirectScheme.scheme=http
-    - traefik.http.middlewares.redirecthttp.redirectScheme.port=8000
-    - traefik.http.services.service3.loadbalancer.server.port=80
-rateLimit:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-rateLimit.entryPoints=httpRateLimit
-    - traefik.http.routers.rt-rateLimit.rule=Host("ratelimit.docker.local")
-    - traefik.http.routers.rt-rateLimit.middlewares=rate
-    - traefik.http.middlewares.rate.ratelimit
-    - traefik.http.middlewares.rate.ratelimit.average=1
-    - traefik.http.middlewares.rate.ratelimit.burst=2
-    - traefik.http.services.service3.loadbalancer.server.port=80
-frontendWhitelist:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt-frontendWhitelist.entryPoints=web
-    - traefik.http.routers.rt-frontendWhitelist.rule=Host("frontend.whitelist.docker.local")
-    - traefik.http.routers.rt-frontendWhitelist.middlewares=wl
-    - traefik.http.middlewares.wl.ipwhitelist.sourcerange=8.8.8.8/32
-    - traefik.http.services.service3.loadbalancer.server.port=80
+version: "3.8"
+services:
+  server0:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-server0.entryPoints: web
+      traefik.http.routers.rt-server0.rule: Path(`/test`)
+      traefik.http.services.service1.loadbalancer.server.port: 80
+
+  server1:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-server1.entryPoints: web
+      traefik.http.routers.rt-server1.rule: Host(`frontend1.docker.local`)
+      traefik.http.routers.rt-server1.service: service1
+      traefik.http.services.service1.loadbalancer.server.port: 80
+
+  server2:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-server2.entryPoints: web
+      traefik.http.routers.rt-server2.rule: Host(`frontend2.docker.local`)
+      traefik.http.services.service2.loadbalancer.server.port: 80
+
+  server3:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-server3.entryPoints: web
+      traefik.http.routers.rt-server3.rule: Host(`frontend2.docker.local`)
+      traefik.http.services.service2.loadbalancer.server.port: 80
+
+  authFrontend:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-authFrontend.entryPoints: httpFrontendAuth
+      traefik.http.routers.rt-authFrontend.rule: Host(`frontend.auth.docker.local`)
+      traefik.http.routers.rt-authFrontend.middlewares: basicauth
+      traefik.http.middlewares.basicauth.basicauth.users: test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
+      traefik.http.services.service3.loadbalancer.server.port: 80
+
+  digestAuthMiddleware:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-digestAuthMiddleware.entryPoints: digestAuth
+      traefik.http.routers.rt-digestAuthMiddleware.rule: Host(`entrypoint.digest.auth.docker.local`)
+      traefik.http.routers.rt-digestAuthMiddleware.middlewares: digestauth
+      traefik.http.middlewares.digestauth.digestauth.users: test:traefik:a2688e031edb4be6a3797f3882655c05, test2:traefik:518845800f9e2bfb1f1f740ec24f074e
+      traefik.http.services.service3.loadbalancer.server.port: 80
+
+  frontendRedirect:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-frontendRedirect.entryPoints: frontendRedirect
+      traefik.http.routers.rt-frontendRedirect.rule: Path(`/test`)
+      traefik.http.routers.rt-frontendRedirect.middlewares: redirecthttp
+      traefik.http.middlewares.redirecthttp.redirectScheme.scheme: http
+      traefik.http.middlewares.redirecthttp.redirectScheme.port: 8000
+      traefik.http.services.service3.loadbalancer.server.port: 80
+
+  rateLimit:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-rateLimit.entryPoints: httpRateLimit
+      traefik.http.routers.rt-rateLimit.rule: Host(`ratelimit.docker.local`)
+      traefik.http.routers.rt-rateLimit.middlewares: rate
+      traefik.http.middlewares.rate.ratelimit.average: 1
+      traefik.http.middlewares.rate.ratelimit.burst: 2
+      traefik.http.services.service3.loadbalancer.server.port: 80
+
+  frontendWhitelist:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt-frontendWhitelist.entryPoints: web
+      traefik.http.routers.rt-frontendWhitelist.rule: Host(`frontend.whitelist.docker.local`)
+      traefik.http.routers.rt-frontendWhitelist.middlewares: wl
+      traefik.http.middlewares.wl.ipwhitelist.sourcerange: 8.8.8.8/32
+      traefik.http.services.service3.loadbalancer.server.port: 80
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/base.yml
+++ b/integration/resources/compose/base.yml
@ -1,11 +1,18 @@
-whoami1:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.router1.rule=PathPrefix("/whoami")
-    - traefik.http.routers.router2.rule=PathPrefix("/whoami2")
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.router1.rule: PathPrefix(`/whoami`)
+      traefik.http.routers.router2.rule: PathPrefix(`/whoami2`)

-whoami2:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=false
+  whoami2:
+    image: traefik/whoami
+    labels:
+      traefik.enable: false
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/consul.yml
+++ b/integration/resources/compose/consul.yml
@ -1,4 +1,9 @@
-consul:
-  image: consul:1.6
-  ports:
-    - "8500:8500"
+version: "3.8"
+services:
+  consul:
+    image: consul:1.6
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/consul_catalog.yml
+++ b/integration/resources/compose/consul_catalog.yml
@ -1,32 +1,37 @@
-consul:
-  image: consul:1.6.2
-  ports:
-    - 8500:8500
-  command: "agent -server -bootstrap -ui -client 0.0.0.0 -hcl 'connect { enabled = true }'"
-consul-agent:
-  image: consul:1.6.2
-  ports:
-    - 8501:8500
-  command: "agent -retry-join consul -client 0.0.0.0"
-  links:
-    - consul
-whoami1:
-  image: traefik/whoami
-  hostname: whoami1
-whoami2:
-  image: traefik/whoami
-  hostname: whoami2
-whoami3:
-  image: traefik/whoami
-  hostname: whoami3
-whoamitcp:
-  image: traefik/whoamitcp
-  hostname: whoamitcp
-connect:
-  image: hashicorpnomad/uuid-api:v5
-  links:
-    - consul
-  environment:
-    PORT: 443
-    BIND: 0.0.0.0
-    CONSUL_HTTP_ADDR: http://consul:8500
+version: "3.8"
+services:
+  consul:
+    image: consul:1.6.2
+    command: agent -server -bootstrap -ui -client 0.0.0.0 -hcl 'connect { enabled = true }'
+
+  consul-agent:
+    image: consul:1.6.2
+    command: agent -retry-join consul -client 0.0.0.0
+
+  whoami1:
+    image: traefik/whoami
+    hostname: whoami1
+
+  whoami2:
+    image: traefik/whoami
+    hostname: whoami2
+
+  whoami3:
+    image: traefik/whoami
+    hostname: whoami3
+
+  whoamitcp:
+    image: traefik/whoamitcp
+    hostname: whoamitcp
+
+  connect:
+    image: hashicorpnomad/uuid-api:v5
+    environment:
+      PORT: 443
+      BIND: 0.0.0.0
+      CONSUL_HTTP_ADDR: http://consul:8500
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/docker.yml
+++ b/integration/resources/compose/docker.yml
@ -0,0 +1,43 @@
+version: "3.8"
+services:
+  simple:
+    image: swarm:1.0.0
+    command: [ "manage", "token://blablabla" ]
+
+  withtcplabels:
+    image: traefik/whoamitcp
+    command: [ "-name", "my.super.host" ]
+    labels:
+      traefik.tcp.Routers.Super.Rule: HostSNI(`my.super.host`)
+      traefik.tcp.Routers.Super.tls: true
+      traefik.tcp.Services.Super.Loadbalancer.server.port: 8080
+
+  withlabels1:
+    image: swarm:1.0.0
+    command: [ "manage", "token://blabla" ]
+    labels:
+      traefik.http.Routers.Super.Rule: Host(`my.super.host`)
+
+  withlabels2:
+    image: swarm:1.0.0
+    command: [ "manage", "token://blablabla" ]
+    labels:
+      traefik.http.Routers.SuperHost.Rule: Host(`my-super.host`)
+
+  withonelabelmissing:
+    image: swarm:1.0.0
+    command: [ "manage", "token://blabla" ]
+    labels:
+      traefik.random.value: my.super.host
+
+  powpow:
+    image: swarm:1.0.0
+    command: [ "manage", "token://blabla" ]
+    labels:
+      traefik.http.Routers.Super.Rule: Host(`my.super.host`)
+      traefik.http.Services.powpow.LoadBalancer.server.Port: 2375
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/error_pages.yml
+++ b/integration/resources/compose/error_pages.yml
@ -1,4 +1,12 @@
-nginx1:
-  image: nginx:1.13.8-alpine
-nginx2:
-  image: nginx:1.13.8-alpine
+version: "3.8"
+services:
+  nginx1:
+    image: nginx:1.13.8-alpine
+
+  nginx2:
+    image: nginx:1.13.8-alpine
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/etcd.yml
+++ b/integration/resources/compose/etcd.yml
@ -1,5 +1,10 @@
-etcd:
-  image: quay.io/coreos/etcd:v3.3.18
-  command: etcd --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2380
-  ports:
-    - "2379:2379"
+version: "3.8"
+services:
+  etcd:
+    image: quay.io/coreos/etcd:v3.3.18
+    command: etcd --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2380
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/file.yml
+++ b/integration/resources/compose/file.yml
@ -1,20 +1,21 @@
-whoami1:
-  image: traefik/whoami
-  ports:
-    - "8881:80"
-whoami2:
-  image: traefik/whoami
-  ports:
-    - "8882:80"
-whoami3:
-  image: traefik/whoami
-  ports:
-    - "8883:80"
-whoami4:
-  image: traefik/whoami
-  ports:
-    - "8884:80"
-whoami5:
-  image: traefik/whoami
-  ports:
-    - "8885:80"
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+
+  whoami2:
+    image: traefik/whoami
+
+  whoami3:
+    image: traefik/whoami
+
+  whoami4:
+    image: traefik/whoami
+
+  whoami5:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/healthcheck.yml
+++ b/integration/resources/compose/healthcheck.yml
@ -1,11 +1,18 @@
-whoami1:
-  image: traefik/whoami
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami

-whoami2:
-  image: traefik/whoami
+  whoami2:
+    image: traefik/whoami

-whoami3:
-  image: traefik/whoami
+  whoami3:
+    image: traefik/whoami

-whoami4:
-  image: traefik/whoami
+  whoami4:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/hostresolver.yml
+++ b/integration/resources/compose/hostresolver.yml
@ -1,6 +1,13 @@
-server1:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.services.service1.loadbalancer.server.port=80
-    - traefik.http.routers.router1.rule=Host("github.com")
+version: "3.8"
+services:
+  server1:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.services.service1.loadbalancer.server.port: 80
+      traefik.http.routers.router1.rule: Host(`github.com`)
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/k8s.yml
+++ b/integration/resources/compose/k8s.yml
@ -1,21 +1,24 @@
-server:
-  image: rancher/k3s:v1.18.20-k3s1
-  command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log
-  environment:
-    - K3S_CLUSTER_SECRET=somethingtotallyrandom
-    - K3S_KUBECONFIG_OUTPUT=/output/kubeconfig.yaml
-    - K3S_KUBECONFIG_MODE=666
-  volumes:
-    - ../../fixtures/k8s/config.skip:/output
-    - ../../fixtures/k8s:/var/lib/rancher/k3s/server/manifests
-  ports:
-    - 6443:6443
+version: "3.8"
+services:
+  server:
+    image: rancher/k3s:v1.18.20-k3s1
+    command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log --bind-address=server --tls-san=server
+    environment:
+      K3S_CLUSTER_SECRET: somethingtotallyrandom
+      K3S_KUBECONFIG_OUTPUT: /output/kubeconfig.yaml
+      K3S_KUBECONFIG_MODE: 666
+    volumes:
+      - ./fixtures/k8s/config.skip:/output
+      - ./fixtures/k8s:/var/lib/rancher/k3s/server/manifests

-node:
-  image: rancher/k3s:v1.18.20-k3s1
-  privileged: true
-  links:
-    - server
-  environment:
-    - K3S_URL=https://server:6443
-    - K3S_CLUSTER_SECRET=somethingtotallyrandom
+  node:
+    image: rancher/k3s:v1.18.20-k3s1
+    privileged: true
+    environment:
+      K3S_URL: https://server:6443
+      K3S_CLUSTER_SECRET: somethingtotallyrandom
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/marathon.yml
+++ b/integration/resources/compose/marathon.yml
@ -1,54 +1,60 @@
-zookeeper:
-  image: zookeeper:3.4.10
+version: "3.8"
+services:
+  zookeeper:
+    image: zookeeper:3.4.10

-mesos-master:
-  links:
-    - zookeeper
-  image: mesosphere/mesos-master:1.0.1-2.0.93.ubuntu1404
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "5050:5050"
-  environment:
-    - MESOS_HOSTNAME=mesos-master
-    - MESOS_CLUSTER=local
-    - MESOS_REGISTRY=in_memory
-    - MESOS_LOG_DIR=/var/log
-    - MESOS_WORK_DIR=/var/lib/mesos
-    - MESOS_ZK=zk://zookeeper:2181/mesos
+  mesos-master:
+    image: mesosphere/mesos-master:1.0.1-2.0.93.ubuntu1404
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "5050:5050"
+    environment:
+      MESOS_HOSTNAME: mesos-master
+      MESOS_CLUSTER: local
+      MESOS_REGISTRY: in_memory
+      MESOS_LOG_DIR: /var/log
+      MESOS_WORK_DIR: /var/lib/mesos
+      MESOS_ZK: zk://zookeeper:2181/mesos

-mesos-slave:
-  links:
-    - zookeeper
-    - mesos-master
-  image: mesosphere/mesos-slave-dind:0.3.0_mesos-1.0.1_docker-1.10.3_ubuntu-14.04.5
-  privileged: true
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "5051:5051"
-  environment:
-    - MESOS_HOSTNAME=mesos-slave
-    - MESOS_CONTAINERIZERS=docker,mesos
-    - MESOS_ISOLATOR=cgroups/cpu,cgroups/mem
-    - MESOS_LOG_DIR=/var/log
-    - MESOS_MASTER=zk://zookeeper:2181/mesos
-    - MESOS_PORT=5051
-    - MESOS_WORK_DIR=/var/lib/mesos
-    - MESOS_EXECUTOR_REGISTRATION_TIMEOUT=5mins
-    - MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD=90secs
-    - MESOS_DOCKER_STOP_TIMEOUT=60secs
-    - MESOS_RESOURCES=cpus:2;mem:2048;disk:20480;ports(*):[12000-12999]
+  mesos-slave:
+    image: docker:dind
+    privileged: true
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "5051:5051"
+    # docker version in mesosphere/mesos-slave-dind:0.3.0_mesos-1.0.1_docker-1.10.3_ubuntu-14.04.5 is too old and can't
+    # pull images on new kernels.
+    command:
+    - "/bin/sh"
+    - "-c"
+    - "(/usr/local/bin/dockerd-entrypoint.sh &); sleep 10; set -x; \
+    docker -H unix:///var/run/docker.sock run -d --net=host --privileged \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /cgroup:/cgroup -v /sys:/sys \
+    -v /usr/local/bin/docker:/usr/local/bin/docker \
+    -e MESOS_HOSTNAME=mesos-slave \
+    -e MESOS_CONTAINERIZERS=docker,mesos \
+    -e MESOS_ISOLATOR=cgroups/cpu,cgroups/mem \
+    -e MESOS_LOG_DIR=/var/log \
+    -e MESOS_MASTER=zk://zookeeper:2181/mesos \
+    -e MESOS_PORT=5051 \
+    -e MESOS_WORK_DIR=/var/lib/mesos \
+    -e MESOS_EXECUTOR_REGISTRATION_TIMEOUT=5mins \
+    -e MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD=90secs \
+    -e MESOS_DOCKER_STOP_TIMEOUT=60secs \
+    -e MESOS_RESOURCES='cpus:2;mem:2048;disk:20480;ports(*):[12000-12999]' \
+    mesosphere/mesos-slave:1.0.3; sleep 600"

-marathon:
-  links:
-    - zookeeper
-    - mesos-master
-    - mesos-slave
-  image: mesosphere/marathon:v1.3.12
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "8080:8080"
-  extra_hosts:
-    - "mesos-slave:172.17.0.1"
-  environment:
-    - MARATHON_ZK=zk://zookeeper:2181/marathon
-    - MARATHON_MASTER=zk://zookeeper:2181/mesos
+  marathon:
+    image: mesosphere/marathon:v1.3.12
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "8080:8080"
+    environment:
+      MARATHON_ZK: zk://zookeeper:2181/marathon
+      MARATHON_MASTER: zk://zookeeper:2181/mesos
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/marathon15.yml
+++ b/integration/resources/compose/marathon15.yml
@ -1,55 +1,51 @@
-zookeeper:
-  image: zookeeper:3.4.10
+version: "3.8"
+services:
+  zookeeper:
+    image: zookeeper:3.4.10

-mesos-master:
-  links:
-    - zookeeper
-  image: mesosphere/mesos-master:1.4.1
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "5050:5050"
-  environment:
-    - MESOS_HOSTNAME=mesos-master
-    - MESOS_CLUSTER=local
-    - MESOS_REGISTRY=in_memory
-    - MESOS_LOG_DIR=/var/log
-    - MESOS_WORK_DIR=/var/lib/mesos
-    - MESOS_ZK=zk://zookeeper:2181/mesos
+  mesos-master:
+    image: mesosphere/mesos-master:1.4.1
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "5050:5050"
+    environment:
+      MESOS_HOSTNAME: mesos-master
+      MESOS_CLUSTER: local
+      MESOS_REGISTRY: in_memory
+      MESOS_LOG_DIR: /var/log
+      MESOS_WORK_DIR: /var/lib/mesos
+      MESOS_ZK: zk://zookeeper:2181/mesos

-mesos-slave:
-  links:
-    - zookeeper
-    - mesos-master
-  image: mesosphere/mesos-slave-dind:0.4.0_mesos-1.4.1_docker-17.05.0_ubuntu-16.04.3
-  privileged: true
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "5051:5051"
-  environment:
-    - MESOS_HOSTNAME=mesos-slave
-    - MESOS_CONTAINERIZERS=docker,mesos
-    - MESOS_ISOLATOR=cgroups/cpu,cgroups/mem
-    - MESOS_LOG_DIR=/var/log
-    - MESOS_MASTER=zk://zookeeper:2181/mesos
-    - MESOS_PORT=5051
-    - MESOS_WORK_DIR=/var/lib/mesos
-    - MESOS_EXECUTOR_REGISTRATION_TIMEOUT=5mins
-    - MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD=90secs
-    - MESOS_DOCKER_STOP_TIMEOUT=60secs
-    - MESOS_RESOURCES=cpus:2;mem:2048;disk:20480;ports(*):[12000-12999]
-    - MESOS_SYSTEMD_ENABLE_SUPPORT=false
+  mesos-slave:
+    image: mesosphere/mesos-slave-dind:0.4.0_mesos-1.4.1_docker-17.05.0_ubuntu-16.04.3
+    privileged: true
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "5051:5051"
+    environment:
+      MESOS_HOSTNAME: mesos-slave
+      MESOS_CONTAINERIZERS: docker,mesos
+      MESOS_ISOLATOR: cgroups/cpu,cgroups/mem
+      MESOS_LOG_DIR: /var/log
+      MESOS_MASTER: zk://zookeeper:2181/mesos
+      MESOS_PORT: 5051
+      MESOS_WORK_DIR: /var/lib/mesos
+      MESOS_EXECUTOR_REGISTRATION_TIMEOUT: 5mins
+      MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD: 90secs
+      MESOS_DOCKER_STOP_TIMEOUT: 60secs
+      MESOS_RESOURCES: cpus:2;mem:2048;disk:20480;ports(*):[12000-12999]
+      MESOS_SYSTEMD_ENABLE_SUPPORT: false

-marathon:
-  links:
-    - zookeeper
-    - mesos-master
-    - mesos-slave
-  image: mesosphere/marathon:v1.5.9
-  # Uncomment published ports for interactive debugging.
-  # ports:
-  #   - "8080:8080"
-  extra_hosts:
-    - "mesos-slave:172.17.0.1"
-  environment:
-    - MARATHON_ZK=zk://zookeeper:2181/marathon
-    - MARATHON_MASTER=zk://zookeeper:2181/mesos
+  marathon:
+    image: mesosphere/marathon:v1.5.9
+    # Uncomment published ports for interactive debugging.
+    # ports:
+    #   - "8080:8080"
+    environment:
+      MARATHON_ZK: zk://zookeeper:2181/marathon
+      MARATHON_MASTER: zk://zookeeper:2181/mesos
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/minimal.yml
+++ b/integration/resources/compose/minimal.yml
@ -1,6 +1,14 @@
-whoami1:
-  image: traefik/whoami
-  labels:
-    - traefik.http.Routers.RouterMini.Rule=PathPrefix("/whoami")
-    - traefik.enable=true
-    
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+    labels:
+      traefik.http.Routers.RouterMini.Rule: PathPrefix(`/whoami`)
+      traefik.enable: true
+    deploy:
+      replicas: 2
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/pebble.yml
+++ b/integration/resources/compose/pebble.yml
@ -1,10 +1,15 @@
-pebble:
-  image: letsencrypt/pebble:v2.3.1
-  command: pebble --dnsserver ${DOCKER_HOST_IP}:5053
-  ports:
-    - 14000:14000
-  environment:
-    # https://github.com/letsencrypt/pebble#testing-at-full-speed
-    - PEBBLE_VA_NOSLEEP=1
-    # https://github.com/letsencrypt/pebble#invalid-anti-replay-nonce-errors
-    - PEBBLE_WFE_NONCEREJECT=0
+version: "3.8"
+services:
+  pebble:
+    image: letsencrypt/pebble:v2.3.1
+    command: pebble --dnsserver traefik:5053
+    environment:
+      # https://github.com/letsencrypt/pebble#testing-at-full-speed
+      PEBBLE_VA_NOSLEEP: 1
+      # https://github.com/letsencrypt/pebble#invalid-anti-replay-nonce-errors
+      PEBBLE_WFE_NONCEREJECT: 0
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/proxy-protocol.yml
+++ b/integration/resources/compose/proxy-protocol.yml
@ -1,7 +1,14 @@
-haproxy:
-  image: haproxy:2.2
-  volumes:
-    - ../haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+version: "3.8"
+services:
+  haproxy:
+    image: haproxy:2.2
+    volumes:
+      - ./resources/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg

-whoami:
-  image: traefik/whoami
+  whoami:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/ratelimit.yml
+++ b/integration/resources/compose/ratelimit.yml
@ -1,2 +1,9 @@
-whoami1:
-  image: traefik/whoami
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/redis.yml
+++ b/integration/resources/compose/redis.yml
@ -1,4 +1,9 @@
-redis:
-  image: redis:5.0
-  ports:
-    - "6379:6379"
+version: "3.8"
+services:
+  redis:
+    image: redis:5.0
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/reqacceptgrace.yml
+++ b/integration/resources/compose/reqacceptgrace.yml
@ -1,2 +1,9 @@
-whoami:
-  image: traefik/whoami
+version: "3.8"
+services:
+  whoami:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/rest.yml
+++ b/integration/resources/compose/rest.yml
@ -1,4 +1,9 @@
-whoami1:
-  image: traefik/whoami
-  ports:
-    - "8881:80"
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/retry.yml
+++ b/integration/resources/compose/retry.yml
@ -1,2 +1,9 @@
-whoami:
-  image: traefik/whoami
+version: "3.8"
+services:
+  whoami:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/stats.yml
+++ b/integration/resources/compose/stats.yml
@ -1,4 +1,12 @@
-whoami1:
-  image: traefik/whoami
-whoami2:
-  image: traefik/whoami
+version: "3.8"
+services:
+  whoami1:
+    image: traefik/whoami
+
+  whoami2:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/tcp.yml
+++ b/integration/resources/compose/tcp.yml
@ -1,38 +1,39 @@
-whoami-a:
-  image: traefik/whoamitcp
-  command: -name whoami-a -certFile /certs/whoami-a.crt -keyFile /certs/whoami-a.key
-  volumes:
-    - ../../fixtures/tcp:/certs
-  ports:
-    - "8081:8080"
+version: "3.8"
+services:
+  whoami-a:
+    image: traefik/whoamitcp
+    command: -name whoami-a -certFile /certs/whoami-a.crt -keyFile /certs/whoami-a.key
+    volumes:
+      - ./fixtures/tcp:/certs

-whoami-b:
-  image: traefik/whoamitcp
-  command: -name whoami-b -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
-  volumes:
-    - ../../fixtures/tcp:/certs
-  ports:
-    - "8082:8080"
+  whoami-b:
+    image: traefik/whoamitcp
+    command: -name whoami-b -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
+    volumes:
+      - ./fixtures/tcp:/certs

-whoami-no-cert:
-  image: traefik/whoamitcp
-  command: -name whoami-no-cert
-  ports:
-    - "8083:8080"
+  whoami-ab:
+    image: traefik/whoamitcp
+    command: -name whoami-ab -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
+    volumes:
+      - ./fixtures/tcp:/certs

-whoami-no-tls:
-  image: traefik/whoamitcp
-  command: -name whoami-no-tls
-  ports:
-    - "8084:8080"
+  whoami-no-cert:
+    image: traefik/whoamitcp
+    command: -name whoami-no-cert

-whoami:
-  image: traefik/whoami
-  ports:
-    - "8085:80"
+  whoami-no-tls:
+    image: traefik/whoamitcp
+    command: -name whoami-no-tls

-whoami-banner:
-  image: traefik/whoamitcp
-  command: -name whoami-banner --banner
-  ports:
-    - "8086:8080"
+  whoami:
+    image: traefik/whoami
+
+  whoami-banner:
+    image: traefik/whoamitcp
+    command: -name whoami-banner --banner
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/timeout.yml
+++ b/integration/resources/compose/timeout.yml
@ -1,7 +1,12 @@
-timeoutEndpoint:
-  image: yaman/timeout
-  environment:
-    - PROTO=http
-    - PORT=9000
-  ports:
-    - "9000:9000"
+version: "3.8"
+services:
+  timeoutEndpoint:
+    image: yaman/timeout
+    environment:
+      PROTO: http
+      PORT: 9000
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/tlsclientheaders.yml
+++ b/integration/resources/compose/tlsclientheaders.yml
@ -1,7 +1,14 @@
-whoami:
+version: "3.8"
+services:
+  whoami:
    image: traefik/whoami
    labels:
-      - traefik.http.routers.route1.rule=PathPrefix(`/foo`)
-      - traefik.http.routers.route1.middlewares=passtls
-      - traefik.http.routers.route1.tls=true
-      - traefik.http.middlewares.passtls.passtlsclientcert.pem=true
+      traefik.http.routers.route1.rule: PathPrefix(`/foo`)
+      traefik.http.routers.route1.middlewares: passtls
+      traefik.http.routers.route1.tls: true
+      traefik.http.middlewares.passtls.passtlsclientcert.pem: true
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/tracing.yml
+++ b/integration/resources/compose/tracing.yml
@ -1,21 +1,20 @@
-zipkin:
-  image: openzipkin/zipkin:2.16.2
-  environment:
-    STORAGE_TYPE: mem
-    JAVA_OPTS: -Dlogging.level.zipkin=DEBUG
-  ports:
-    - 9411:9411
-jaeger:
-  image: jaegertracing/all-in-one:1.14
-  environment:
-    COLLECTOR_ZIPKIN_HTTP_PORT: 9411
-  ports:
-    - "5775:5775/udp"
-    - "6831:6831/udp"
-    - "6832:6832/udp"
-    - "5778:5778"
-    - "16686:16686"
-    - "14268:14268"
-    - "9411:9411"
-whoami:
-  image: traefik/whoami
+version: "3.8"
+services:
+  zipkin:
+    image: openzipkin/zipkin:2.16.2
+    environment:
+      STORAGE_TYPE: mem
+      JAVA_OPTS: -Dlogging.level.zipkin=DEBUG
+
+  jaeger:
+    image: jaegertracing/all-in-one:1.14
+    environment:
+      COLLECTOR_ZIPKIN_HTTP_PORT: 9411
+
+  whoami:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/udp.yml
+++ b/integration/resources/compose/udp.yml
@ -1,14 +1,21 @@
-whoami-a:
-  image: traefik/whoamiudp:latest
-  command: -name whoami-a
+version: "3.8"
+services:
+  whoami-a:
+    image: traefik/whoamiudp:latest
+    command: -name whoami-a

-whoami-b:
-  image: traefik/whoamiudp:latest
-  command: -name whoami-b
+  whoami-b:
+    image: traefik/whoamiudp:latest
+    command: -name whoami-b

-whoami-c:
-  image: traefik/whoamiudp:latest
-  command: -name whoami-c
+  whoami-c:
+    image: traefik/whoamiudp:latest
+    command: -name whoami-c

-whoami-d:
-  image: traefik/whoami
+  whoami-d:
+    image: traefik/whoami
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/whitelist.yml
+++ b/integration/resources/compose/whitelist.yml
@ -1,34 +1,41 @@
-noOverrideWhitelist:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt1.rule=Host("no.override.whitelist.docker.local")
-    - traefik.http.routers.rt1.middlewares=wl1
-    - traefik.http.middlewares.wl1.ipwhiteList.sourceRange=8.8.8.8
+version: "3.8"
+services:
+  noOverrideWhitelist:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt1.rule: Host(`no.override.whitelist.docker.local`)
+      traefik.http.routers.rt1.middlewares: wl1
+      traefik.http.middlewares.wl1.ipwhiteList.sourceRange: 8.8.8.8

-overrideIPStrategyRemoteAddrWhitelist:
-  image: traefik/whoami
-  labels:
-    - traefik.enable=true
-    - traefik.http.routers.rt2.rule=Host("override.remoteaddr.whitelist.docker.local")
-    - traefik.http.routers.rt2.middlewares=wl2
-    - traefik.http.middlewares.wl2.ipwhitelist.sourceRange=8.8.8.8
-    - traefik.http.middlewares.wl2.ipwhitelist.ipStrategy=true
+  overrideIPStrategyRemoteAddrWhitelist:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt2.rule: Host(`override.remoteaddr.whitelist.docker.local`)
+      traefik.http.routers.rt2.middlewares: wl2
+      traefik.http.middlewares.wl2.ipwhitelist.sourceRange: 8.8.8.8
+      traefik.http.middlewares.wl2.ipwhitelist.ipStrategy: true

-overrideIPStrategyDepthWhitelist:
-  image: traefik/whoami
-  labels:
-  - traefik.enable=true
-  - traefik.http.routers.rt3.rule=Host("override.depth.whitelist.docker.local")
-  - traefik.http.routers.rt3.middlewares=wl3
-  - traefik.http.middlewares.wl3.ipwhitelist.sourceRange=8.8.8.8
-  - traefik.http.middlewares.wl3.ipwhitelist.ipStrategy.depth=3
+  overrideIPStrategyDepthWhitelist:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt3.rule: Host(`override.depth.whitelist.docker.local`)
+      traefik.http.routers.rt3.middlewares: wl3
+      traefik.http.middlewares.wl3.ipwhitelist.sourceRange: 8.8.8.8
+      traefik.http.middlewares.wl3.ipwhitelist.ipStrategy.depth: 3

-overrideIPStrategyExcludedIPsWhitelist:
-  image: traefik/whoami
-  labels:
-  - traefik.enable=true
-  - traefik.http.routers.rt4.rule=Host("override.excludedips.whitelist.docker.local")
-  - traefik.http.routers.rt4.middlewares=wl4
-  - traefik.http.middlewares.wl4.ipwhitelist.sourceRange=8.8.8.8
-  - traefik.http.middlewares.wl4.ipwhitelist.ipStrategy.excludedIPs=10.0.0.1,10.0.0.2
+  overrideIPStrategyExcludedIPsWhitelist:
+    image: traefik/whoami
+    labels:
+      traefik.enable: true
+      traefik.http.routers.rt4.rule: Host(`override.excludedips.whitelist.docker.local`)
+      traefik.http.routers.rt4.middlewares: wl4
+      traefik.http.middlewares.wl4.ipwhitelist.sourceRange: 8.8.8.8
+      traefik.http.middlewares.wl4.ipwhitelist.ipStrategy.excludedIPs: 10.0.0.1,10.0.0.2
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true
--- a/integration/resources/compose/zookeeper.yml
+++ b/integration/resources/compose/zookeeper.yml
@ -1,4 +1,9 @@
-zookeeper:
-  image: zookeeper:3.5
-  ports:
-    - "2181:2181"
+version: "3.8"
+services:
+  zookeeper:
+    image: zookeeper:3.5
+
+networks:
+  default:
+    name: traefik-test-network
+    external: true