diff --git a/docker/catmario/docker-compose.yml b/docker/catmario/docker-compose.yml index eedbb06..8db8244 100644 --- a/docker/catmario/docker-compose.yml +++ b/docker/catmario/docker-compose.yml @@ -1,18 +1,17 @@ services: catmario: - container_name: catmario image: nginx:1.25.5 networks: - default - traefik labels: - traefik.enable=true - - traefik.http.routers.catmario.priority=1000 - - traefik.http.routers.catmario.rule=Host(`catmario.yuuk1.uk`) - - traefik.http.routers.catmario.tls=true - - traefik.http.routers.catmario.tls.certResolver=letsencrypt - - traefik.http.routers.catmario.service=catmario-routing-service - - traefik.http.services.catmario-routing-service.loadbalancer.server.port=80 + - traefik.http.routers.R6.rule=Host(`catmario.yuuk1.uk`) + - traefik.http.routers.R6.entryPoints=websecure + - traefik.http.routers.R6.tls=true + - traefik.http.routers.R6.tls.certResolver=letsencrypt + - traefik.http.routers.R6.service=S6 + - traefik.http.services.S6.loadbalancer.server.port=80 volumes: - ../../repo/catmario/docs:/usr/share/nginx/html diff --git a/docker/litey/docker-compose.yml b/docker/litey/docker-compose.yml index c67e832..1c0c35f 100644 --- a/docker/litey/docker-compose.yml +++ b/docker/litey/docker-compose.yml @@ -1,6 +1,5 @@ services: litey: - container_name: litey build: context: ../../repo/litey networks: diff --git a/docker/taiko-web-redirect/docker-compose.yml b/docker/taiko-web-redirect/docker-compose.yml index 4e9e71a..12716ea 100644 --- a/docker/taiko-web-redirect/docker-compose.yml +++ b/docker/taiko-web-redirect/docker-compose.yml @@ -1,17 +1,17 @@ services: - twr: - container_name: twr + taiko-web-redirect: image: arbarwings/docker-web-redirect:latest networks: - default - traefik labels: - traefik.enable=true - - traefik.http.routers.twr.rule=Host(`taiko-web-is-4ever.yuuk1.tk`) || Host(`taiko-web-v2.yuuk1.tk`) - - traefik.http.routers.twr.tls=true - - traefik.http.routers.twr.tls.certResolver=letsencrypt - - traefik.http.routers.twr.service=twr-routing-service - - traefik.http.services.twr-routing-service.loadbalancer.server.port=80 + - traefik.http.routers.R5.rule=Host(`taiko-web-is-4ever.yuuk1.tk`) || Host(`taiko-web-v2.yuuk1.tk`) + - traefik.http.routers.R5.entryPoints=websecure + - traefik.http.routers.R5.tls=true + - traefik.http.routers.R5.tls.certResolver=letsencrypt + - traefik.http.routers.R5.service=S5 + - traefik.http.services.S5.loadbalancer.server.port=80 environment: - REDIRECT_TARGET=taikoapp.uk