diff --git a/docker-compose.yaml b/docker-compose.yaml index 334d63c..7143493 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,4 @@ services: - # Web App Service webapp: build: context: . @@ -10,15 +9,28 @@ services: - webnet labels: - "traefik.enable=true" - - "traefik.http.routers.webapp.rule=Host(`duooomi.com`) || Host(`www.duooomi.com`)" + + # Main site: duooomi.com + - "traefik.http.routers.webapp.rule=Host(`duooomi.com`)" - "traefik.http.routers.webapp.entrypoints=websecure" - "traefik.http.routers.webapp.tls=true" - "traefik.http.routers.webapp.tls.certresolver=myresolver" - "traefik.http.services.webapp.loadbalancer.server.port=5173" + + # Redirect www.duooomi.com -> duooomi.com + - "traefik.http.routers.webapp-www.rule=Host(`www.duooomi.com`)" + - "traefik.http.routers.webapp-www.entrypoints=websecure" + - "traefik.http.routers.webapp-www.tls=true" + - "traefik.http.routers.webapp-www.tls.certresolver=myresolver" + - "traefik.http.routers.webapp-www.middlewares=redirect-www-to-apex" + - "traefik.http.routers.webapp-www.service=webapp" + + - "traefik.http.middlewares.redirect-www-to-apex.redirectregex.regex=^https://www\\.duooomi\\.com/?(.*)" + - "traefik.http.middlewares.redirect-www-to-apex.redirectregex.replacement=https://duooomi.com/$${1}" + - "traefik.http.middlewares.redirect-www-to-apex.redirectregex.permanent=true" expose: - "5173" - # Traefik Reverse Proxy traefik: image: ghcr.io/traefik/traefik:v3.3 container_name: traefik @@ -27,11 +39,15 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" + + # Entrypoints - "--entrypoints.web.address=:80" - "--entrypoints.web.http.redirections.entrypoint.to=websecure" - "--entrypoints.web.http.redirections.entrypoint.scheme=https" - "--entrypoints.web.http.redirections.entrypoint.permanent=true" - "--entrypoints.websecure.address=:443" + + # Let's Encrypt - "--certificatesresolvers.myresolver.acme.httpchallenge=true" - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web" - "--certificatesresolvers.myresolver.acme.email=admin@duooomi.com" @@ -39,7 +55,7 @@ services: ports: - "80:80" - "443:443" - - "8080:8080" # Traefik dashboard + - "8080:8080" volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - "./letsencrypt:/letsencrypt" @@ -51,4 +67,4 @@ networks: driver: bridge volumes: - letsencrypt: \ No newline at end of file + letsencrypt: