mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-17 13:55:08 +00:00
Merge branch 'main' into chore/Update-Traefik-to-Version-3.6
This commit is contained in:
commit
6b0a7cc218
5 changed files with 16 additions and 0 deletions
|
|
@ -60,6 +60,10 @@ SITES_RULE=Host(`mysite.example.com`)
|
|||
SITES_RULE=Host(`a.example.com`) || Host(`b.example.com`)
|
||||
```
|
||||
|
||||
> Note: `SITES` currently supplies the host list that goes into the `Host(...)` rules. Once the Traefik v3 transition is completed, the plan is to switch to `SITES_RULE` (full rule expression) and deprecate `SITES` to map the Traefik Rule Syntax.
|
||||
|
||||
> Currently the used syntax is pinned to v2 via `--core.defaultRuleSyntax=v2`).
|
||||
|
||||
---
|
||||
|
||||
## Site Configuration
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ services:
|
|||
command:
|
||||
- --providers.docker=true
|
||||
- --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.http.redirections.entrypoint.to=websecure
|
||||
- --entrypoints.web.http.redirections.entrypoint.scheme=https
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ services:
|
|||
command:
|
||||
- --providers.docker
|
||||
- --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
|
||||
ports:
|
||||
- ${HTTP_PUBLISH_PORT:-80}:80
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ services:
|
|||
- --providers.docker=true
|
||||
# Do not expose all Docker services, only the ones explicitly exposed
|
||||
- --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
|
||||
- --entrypoints.http.address=:80
|
||||
# Create an entrypoint https listening on port 443
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ services:
|
|||
- --providers.docker=true
|
||||
# Do not expose all Docker services, only the ones explicitly exposed
|
||||
- --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
|
||||
- --entrypoints.http.address=:80
|
||||
# Enable the access log, with HTTP requests
|
||||
|
|
|
|||
Loading…
Reference in a new issue