Merge v2.10 into v3.0

This commit is contained in:
mmatur 2023-10-11 16:20:26 +02:00
commit 286181aa61
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
62 changed files with 712 additions and 189 deletions

View file

@ -85,6 +85,16 @@ services:
traefik.http.middlewares.wl.ipallowlist.sourcerange: 8.8.8.8/32
traefik.http.services.service3.loadbalancer.server.port: 80
preflightCORS:
image: traefik/whoami
labels:
traefik.enable: true
traefik.http.routers.rt-preflightCORS.entryPoints: preflight
traefik.http.routers.rt-preflightCORS.rule: Host(`preflight.docker.local`)
traefik.http.routers.rt-preflightCORS.middlewares: preflightCORS
traefik.http.middlewares.preflightCORS.headers.accessControlAllowMethods: OPTIONS, GET
traefik.http.services.preflightCORS.loadbalancer.server.port: 80
networks:
default:
name: traefik-test-network

View file

@ -2,6 +2,8 @@ version: "3.8"
services:
consul:
image: consul:1.6
whoami:
image: traefik/whoami
networks:
default: