epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-17 13:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: drop rule syntax and v2 override

Browse source
This commit is contained in:
RocketQuack 2026-01-25 14:30:48 +01:00
parent e3e332659d
commit 269e44e2cd
7 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
overrides/compose.custom-domain.yaml
View file

@ -14,7 +14,6 @@ services:
- traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=2016 - traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=2016
- traefik.http.routers.${ROUTER}.service=${ROUTER} - traefik.http.routers.${ROUTER}.service=${ROUTER}
- traefik.http.routers.${ROUTER}.entrypoints=http - traefik.http.routers.${ROUTER}.entrypoints=http
- traefik.http.routers.${ROUTER}.ruleSyntax=v3
- traefik.http.routers.${ROUTER}.rule=${SITES_RULE?SITES_RULE not set} - traefik.http.routers.${ROUTER}.rule=${SITES_RULE?SITES_RULE not set}
- traefik.http.middlewares.${ROUTER}.headers.customrequestheaders.Host=${BASE_SITE?BASE_SITE not set} - traefik.http.middlewares.${ROUTER}.headers.customrequestheaders.Host=${BASE_SITE?BASE_SITE not set}
- traefik.http.routers.${ROUTER}.middlewares=${ROUTER} - traefik.http.routers.${ROUTER}.middlewares=${ROUTER}

4
overrides/compose.https.yaml
View file

@ -5,7 +5,6 @@ services:
- traefik.http.services.frontend.loadbalancer.server.port=8080 - traefik.http.services.frontend.loadbalancer.server.port=8080
- traefik.http.routers.frontend-http.entrypoints=websecure - traefik.http.routers.frontend-http.entrypoints=websecure
- traefik.http.routers.frontend-http.tls.certresolver=main-resolver - traefik.http.routers.frontend-http.tls.certresolver=main-resolver
- traefik.http.routers.frontend-http.ruleSyntax=v3
- traefik.http.routers.frontend-http.rule=${SITES_RULE:?SITES_RULE not set} - traefik.http.routers.frontend-http.rule=${SITES_RULE:?SITES_RULE not set}
proxy: proxy:
@ -14,9 +13,6 @@ services:
command: command:
- --providers.docker=true - --providers.docker=true
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Keep v2 rule syntax for now
# Ensure compatibility with existing labels (will be removed if v3 transition is complete)
- --core.defaultRuleSyntax=v2
- --entrypoints.web.address=:80 - --entrypoints.web.address=:80
- --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.scheme=https

1
overrides/compose.multi-bench-ssl.yaml
View file

@ -5,7 +5,6 @@ services:
- traefik.http.routers.${ROUTER}-http.middlewares=https-redirect - traefik.http.routers.${ROUTER}-http.middlewares=https-redirect
# ${ROUTER}-https the actual router using HTTPS # ${ROUTER}-https the actual router using HTTPS
# Uses the environment variable SITES_RULE # Uses the environment variable SITES_RULE
- traefik.http.routers.${ROUTER}-https.ruleSyntax=v3
- traefik.http.routers.${ROUTER}-https.rule=${SITES_RULE?SITES_RULE not set} - traefik.http.routers.${ROUTER}-https.rule=${SITES_RULE?SITES_RULE not set}
- traefik.http.routers.${ROUTER}-https.entrypoints=https - traefik.http.routers.${ROUTER}-https.entrypoints=https
- traefik.http.routers.${ROUTER}-https.tls=true - traefik.http.routers.${ROUTER}-https.tls=true

1
overrides/compose.multi-bench.yaml
View file

@ -9,7 +9,6 @@ services:
- traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=8080 - traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=8080
- traefik.http.routers.${ROUTER}-http.service=${ROUTER} - traefik.http.routers.${ROUTER}-http.service=${ROUTER}
- traefik.http.routers.${ROUTER}-http.entrypoints=http - traefik.http.routers.${ROUTER}-http.entrypoints=http
- traefik.http.routers.${ROUTER}-http.ruleSyntax=v3
- traefik.http.routers.${ROUTER}-http.rule=${SITES_RULE?SITES_RULE not set} - traefik.http.routers.${ROUTER}-http.rule=${SITES_RULE?SITES_RULE not set}
configurator: configurator:
networks: networks:

4
overrides/compose.proxy.yaml
View file

@ -4,7 +4,6 @@ services:
- traefik.enable=true - traefik.enable=true
- traefik.http.services.frontend.loadbalancer.server.port=8080 - traefik.http.services.frontend.loadbalancer.server.port=8080
- traefik.http.routers.frontend-http.entrypoints=web - traefik.http.routers.frontend-http.entrypoints=web
- traefik.http.routers.frontend-http.ruleSyntax=v3
- traefik.http.routers.frontend-http.rule=HostRegexp(`^.+$`) - traefik.http.routers.frontend-http.rule=HostRegexp(`^.+$`)
proxy: proxy:
@ -12,9 +11,6 @@ services:
command: command:
- --providers.docker - --providers.docker
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Keep v2 rule syntax for now
# Ensure compatibility with existing labels (will be removed if v3 transition is complete)
- --core.defaultRuleSyntax=v2
- --entrypoints.web.address=:80 - --entrypoints.web.address=:80
ports: ports:
- ${HTTP_PUBLISH_PORT:-80}:80 - ${HTTP_PUBLISH_PORT:-80}:80

4
overrides/compose.traefik-ssl.yaml
View file

@ -9,7 +9,6 @@ services:
- traefik.http.routers.traefik-public-http.middlewares=https-redirect - traefik.http.routers.traefik-public-http.middlewares=https-redirect
# traefik-https the actual router using HTTPS # traefik-https the actual router using HTTPS
# Uses the environment variable DOMAIN # Uses the environment variable DOMAIN
- traefik.http.routers.traefik-public-https.ruleSyntax=v3
- traefik.http.routers.traefik-public-https.rule=Host(`${TRAEFIK_DOMAIN}`) - traefik.http.routers.traefik-public-https.rule=Host(`${TRAEFIK_DOMAIN}`)
- traefik.http.routers.traefik-public-https.entrypoints=https - traefik.http.routers.traefik-public-https.entrypoints=https
- traefik.http.routers.traefik-public-https.tls=true - traefik.http.routers.traefik-public-https.tls=true
@ -24,9 +23,6 @@ services:
- --providers.docker=true - --providers.docker=true
# Do not expose all Docker services, only the ones explicitly exposed # Do not expose all Docker services, only the ones explicitly exposed
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Keep v2 rule syntax for now
# Ensure compatibility with existing labels (will be removed if v3 transition is complete)
- --core.defaultRuleSyntax=v2
# Create an entrypoint http listening on port 80 # Create an entrypoint http listening on port 80
- --entrypoints.http.address=:80 - --entrypoints.http.address=:80
# Create an entrypoint https listening on port 443 # Create an entrypoint https listening on port 443

4
overrides/compose.traefik.yaml
View file

@ -11,7 +11,6 @@ services:
# Using the environment variables USERNAME and HASHED_PASSWORD # Using the environment variables USERNAME and HASHED_PASSWORD
- traefik.http.middlewares.admin-auth.basicauth.users=admin:${HASHED_PASSWORD:?No HASHED_PASSWORD set} - traefik.http.middlewares.admin-auth.basicauth.users=admin:${HASHED_PASSWORD:?No HASHED_PASSWORD set}
# Uses the environment variable TRAEFIK_DOMAIN # Uses the environment variable TRAEFIK_DOMAIN
- traefik.http.routers.traefik-public-http.ruleSyntax=v3
- traefik.http.routers.traefik-public-http.rule=Host(`${TRAEFIK_DOMAIN:?No TRAEFIK_DOMAIN set}`) - traefik.http.routers.traefik-public-http.rule=Host(`${TRAEFIK_DOMAIN:?No TRAEFIK_DOMAIN set}`)
- traefik.http.routers.traefik-public-http.entrypoints=http - traefik.http.routers.traefik-public-http.entrypoints=http
# Use the special Traefik service api@internal with the web UI/Dashboard # Use the special Traefik service api@internal with the web UI/Dashboard
@ -25,9 +24,6 @@ services:
- --providers.docker=true - --providers.docker=true
# Do not expose all Docker services, only the ones explicitly exposed # Do not expose all Docker services, only the ones explicitly exposed
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
# Keep v2 rule syntax for now
# Ensure compatibility with existing labels (will be removed if v3 transition is complete)
- --core.defaultRuleSyntax=v2
# Create an entrypoint http listening on port 80 # Create an entrypoint http listening on port 80
- --entrypoints.http.address=:80 - --entrypoints.http.address=:80
# Enable the access log, with HTTP requests # Enable the access log, with HTTP requests