Compare commits

..

No commits in common. "01be84ec0a768cda872a9b78c2b7554cd876b3af" and "e03268af4cf942c47cba66c2112628dbcad1b756" have entirely different histories.

2 changed files with 10 additions and 10 deletions

View File

@ -18,14 +18,9 @@ services:
- --api.debug=${DEBUG:-false} - --api.debug=${DEBUG:-false}
- --log.level=${LOG_LEVEL:-ERROR} - --log.level=${LOG_LEVEL:-ERROR}
- --entrypoints.web.address=:80 - --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.local.address=:8443 - --entrypoints.local.address=:8443
- --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https
- --entrypoints.web.http.redirections.entrypoint.permanent=true
ports: ports:
- "${WEB_PORT:-0.0.0.0:80:80}" - "${WEB_PORT:-127.0.0.1:8000:80}"
- "${WEBSECURE_PORT:-0.0.0.0:443:443}"
- "${LOCAL_PORT:-127.0.0.1:8443:8443}" - "${LOCAL_PORT:-127.0.0.1:8443:8443}"
labels: labels:
- "traefik.http.routers.${ROUTER:-traefik}.rule=Host(`${DOMAIN:-traefik.local.krislamo.org}`)" - "traefik.http.routers.${ROUTER:-traefik}.rule=Host(`${DOMAIN:-traefik.local.krislamo.org}`)"

View File

@ -14,21 +14,26 @@ services:
command: command:
- --providers.docker=true - --providers.docker=true
- --providers.docker.exposedbydefault=${EXPOSED_BY_DEFAULT:-false} - --providers.docker.exposedbydefault=${EXPOSED_BY_DEFAULT:-false}
- --api.dashboard=${DASHBOARD:-false} - --api.dashboard=${DASHBOARD:-true}
- --api.debug=${DEBUG:-false} - --api.debug=${DEBUG:-false}
- --log.level=${LOG_LEVEL:-ERROR} - --log.level=${LOG_LEVEL:-ERROR}
- --entrypoints.web.address=:80 - --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.local.address=:8443 - --entrypoints.local.address=:8443
- --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https
- --entrypoints.web.http.redirections.entrypoint.permanent=true
ports: ports:
- "${WEB_PORT:-127.0.0.1:8000:80}" - "${WEB_PORT:-0.0.0.0:80:80}"
- "${WEBSECURE_PORT:-0.0.0.0:443:443}"
- "${LOCAL_PORT:-127.0.0.1:8443:8443}" - "${LOCAL_PORT:-127.0.0.1:8443:8443}"
labels: labels:
- "traefik.http.routers.${ROUTER:-traefik}.rule=Host(`${DOMAIN:-traefik.local.krislamo.org}`)" - "traefik.http.routers.${ROUTER:-traefik}.rule=Host(`${DOMAIN:-traefik.local.krislamo.org}`)"
- "traefik.http.routers.${ROUTER:-traefik}.service=api@internal" - "traefik.http.routers.${ROUTER:-traefik}.service=api@internal"
- "traefik.http.routers.${ROUTER:-traefik}.entrypoints=${ENTRYPOINT:-local}" - "traefik.http.routers.${ROUTER:-traefik}.entrypoints=${ENTRYPOINT:-local}"
- "traefik.http.routers.${ROUTER:-traefik}.tls=${DASHBOARD_TLS:-true}" - "traefik.http.routers.${ROUTER:-traefik}.tls=${ENABLE_TLS:-true}"
- "traefik.docker.network=${NETWORK:-traefik}" - "traefik.docker.network=${NETWORK:-traefik}"
- "traefik.enable=${DASHBOARD:-false}" - "traefik.enable=${ENABLE:-false}"
networks: networks:
- traefik - traefik
volumes: volumes: