From 91f29004632bbb81126744457f2195918284c563 Mon Sep 17 00:00:00 2001 From: stratself Date: Thu, 16 Apr 2026 10:48:26 +0000 Subject: [PATCH] docs(docker): More compose cleanups * Stringify and use long URLs for image names * Use read-only docker socket in traefik mount * Shorten some comments --- .../advanced/delegated.docker-compose.for-traefik.yml | 5 ++--- .../delegated.docker-compose.with-caddy-labels.yml | 4 ++-- .../advanced/delegated.docker-compose.with-caddy.yml | 6 +++--- .../delegated.docker-compose.with-traefik.yml | 7 ++++--- docs/public/deploying/docker-compose.for-traefik.yml | 5 ++--- docs/public/deploying/docker-compose.override.yml | 11 ++++------- .../deploying/docker-compose.with-caddy-labels.yml | 4 ++-- docs/public/deploying/docker-compose.with-caddy.yml | 6 +++--- docs/public/deploying/docker-compose.with-traefik.yml | 7 ++++--- docs/public/deploying/docker-compose.yml | 3 +-- 10 files changed, 27 insertions(+), 31 deletions(-) diff --git a/docs/public/advanced/delegated.docker-compose.for-traefik.yml b/docs/public/advanced/delegated.docker-compose.for-traefik.yml index 2c170a984..4b5d0fed8 100644 --- a/docs/public/advanced/delegated.docker-compose.for-traefik.yml +++ b/docs/public/advanced/delegated.docker-compose.for-traefik.yml @@ -2,7 +2,7 @@ services: homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -38,7 +38,6 @@ volumes: db: networks: - # This is the network Traefik listens to, if your network has a different - # name, don't forget to change it here and in the docker-compose.override.yml + # This must match the network name that Traefik listens on proxy: external: true diff --git a/docs/public/advanced/delegated.docker-compose.with-caddy-labels.yml b/docs/public/advanced/delegated.docker-compose.with-caddy-labels.yml index 3fac2e410..5ce6f1f5b 100644 --- a/docs/public/advanced/delegated.docker-compose.with-caddy-labels.yml +++ b/docs/public/advanced/delegated.docker-compose.with-caddy-labels.yml @@ -4,7 +4,7 @@ services: caddy: # This compose file uses caddy-docker-proxy as the reverse proxy for Continuwuity! # For more info, visit https://github.com/lucaslorentz/caddy-docker-proxy - image: lucaslorentz/caddy-docker-proxy:ci-alpine + image: "docker.io/lucaslorentz/caddy-docker-proxy:ci-alpine" ports: - 80:80 - 443:443 @@ -21,7 +21,7 @@ services: caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008 homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: diff --git a/docs/public/advanced/delegated.docker-compose.with-caddy.yml b/docs/public/advanced/delegated.docker-compose.with-caddy.yml index c6e7d2dcb..2f623a236 100644 --- a/docs/public/advanced/delegated.docker-compose.with-caddy.yml +++ b/docs/public/advanced/delegated.docker-compose.with-caddy.yml @@ -2,7 +2,7 @@ services: caddy: - image: docker.io/caddy:latest + image: "docker.io/caddy:latest" ports: - 80:80 - 443:443 @@ -16,7 +16,7 @@ services: target: /etc/caddy/Caddyfile homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -52,6 +52,6 @@ configs: https://matrix.example.com:443 { reverse_proxy http://homeserver:8008 } - https://example.com { + https://example.com:443 { reverse_proxy /.well-known/matrix* http://homeserver:8008 } diff --git a/docs/public/advanced/delegated.docker-compose.with-traefik.yml b/docs/public/advanced/delegated.docker-compose.with-traefik.yml index 2dbaaa531..675f2a18e 100644 --- a/docs/public/advanced/delegated.docker-compose.with-traefik.yml +++ b/docs/public/advanced/delegated.docker-compose.with-traefik.yml @@ -2,7 +2,7 @@ services: homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -32,14 +32,14 @@ services: } traefik: - image: "traefik:latest" + image: "docker.io/traefik:latest" container_name: "traefik" restart: "unless-stopped" ports: - "80:80" - "443:443" volumes: - - "/var/run/docker.sock:/var/run/docker.sock:z" + - "/var/run/docker.sock:/var/run/docker.sock:ro" - "acme:/etc/traefik/acme" labels: - "traefik.enable=true" @@ -52,6 +52,7 @@ services: - "traefik.http.routers.redirs.middlewares=redirect-to-https" environment: + TRAEFIK_LOG_LEVEL: DEBUG TRAEFIK_ENTRYPOINTS_WEB: true TRAEFIK_ENTRYPOINTS_WEB_ADDRESS: ":80" diff --git a/docs/public/deploying/docker-compose.for-traefik.yml b/docs/public/deploying/docker-compose.for-traefik.yml index 2a7cddbbd..61cdb1bea 100644 --- a/docs/public/deploying/docker-compose.for-traefik.yml +++ b/docs/public/deploying/docker-compose.for-traefik.yml @@ -2,7 +2,7 @@ services: homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -38,7 +38,6 @@ volumes: db: networks: - # This is the network Traefik listens to, if your network has a different - # name, don't forget to change it here and in the docker-compose.override.yml + # This must match the network name that Traefik listens on proxy: external: true diff --git a/docs/public/deploying/docker-compose.override.yml b/docs/public/deploying/docker-compose.override.yml index bcb6f2535..5906bb314 100644 --- a/docs/public/deploying/docker-compose.override.yml +++ b/docs/public/deploying/docker-compose.override.yml @@ -4,7 +4,7 @@ services: homeserver: labels: - "traefik.enable=true" - - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network + - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network - "traefik.http.routers.to-continuwuity.rule=Host(`example.com`)" # Change to the address on which Continuwuity is hosted - "traefik.http.routers.to-continuwuity.tls=true" @@ -14,13 +14,10 @@ services: # This must match with CONTINUWUITY_PORT (default: 8008) - "traefik.http.services.to_continuwuity.loadbalancer.server.port=8008" - - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*" - - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization" - - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS" - # If you want to have your account on , but host Continuwuity on a subdomain, - # you can let it only handle the well known file on that domain instead - #- "traefik.http.routers.to-matrix-wellknown.rule=Host(`example.com`) && PathPrefix(`/.well-known/matrix`)" + # you can let it only handle the well known file on the base domain instead + # + # - "traefik.http.routers.to-matrix-wellknown.rule=Host(`example.com`) && PathPrefix(`/.well-known/matrix`)" #- "traefik.http.routers.to-matrix-wellknown.tls=true" #- "traefik.http.routers.to-matrix-wellknown.tls.certresolver=letsencrypt" #- "traefik.http.routers.to-matrix-wellknown.middlewares=cors-headers@docker" diff --git a/docs/public/deploying/docker-compose.with-caddy-labels.yml b/docs/public/deploying/docker-compose.with-caddy-labels.yml index 6a87fb502..d80f5e01c 100644 --- a/docs/public/deploying/docker-compose.with-caddy-labels.yml +++ b/docs/public/deploying/docker-compose.with-caddy-labels.yml @@ -4,7 +4,7 @@ services: caddy: # This compose file uses caddy-docker-proxy as the reverse proxy for Continuwuity! # For more info, visit https://github.com/lucaslorentz/caddy-docker-proxy - image: lucaslorentz/caddy-docker-proxy:ci-alpine + image: "docker.io/lucaslorentz/caddy-docker-proxy:ci-alpine" ports: - 80:80 - 443:443 @@ -18,7 +18,7 @@ services: restart: unless-stopped homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: diff --git a/docs/public/deploying/docker-compose.with-caddy.yml b/docs/public/deploying/docker-compose.with-caddy.yml index 1316d917f..5111538c5 100644 --- a/docs/public/deploying/docker-compose.with-caddy.yml +++ b/docs/public/deploying/docker-compose.with-caddy.yml @@ -2,7 +2,7 @@ services: caddy: - image: docker.io/caddy:latest + image: "docker.io/caddy:latest" ports: - 80:80 - 443:443 @@ -17,7 +17,7 @@ services: target: /etc/caddy/Caddyfile homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -51,6 +51,6 @@ volumes: configs: Caddyfile: content: | - https://example.com, https://example.com:8448 { + https://example.com:443, https://example.com:8448 { reverse_proxy http://homeserver:8008 } diff --git a/docs/public/deploying/docker-compose.with-traefik.yml b/docs/public/deploying/docker-compose.with-traefik.yml index 587efa691..9eac48e82 100644 --- a/docs/public/deploying/docker-compose.with-traefik.yml +++ b/docs/public/deploying/docker-compose.with-traefik.yml @@ -2,7 +2,7 @@ services: homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit volumes: @@ -32,14 +32,14 @@ services: } traefik: - image: "traefik:latest" + image: "docker.io/traefik:latest" container_name: "traefik" restart: "unless-stopped" ports: - "80:80" - "443:443" volumes: - - "/var/run/docker.sock:/var/run/docker.sock:z" + - "/var/run/docker.sock:/var/run/docker.sock:ro" - "acme:/etc/traefik/acme" labels: - "traefik.enable=true" @@ -52,6 +52,7 @@ services: - "traefik.http.routers.redirs.middlewares=redirect-to-https" environment: + TRAEFIK_LOG_LEVEL: DEBUG TRAEFIK_ENTRYPOINTS_WEB: true TRAEFIK_ENTRYPOINTS_WEB_ADDRESS: ":80" diff --git a/docs/public/deploying/docker-compose.yml b/docs/public/deploying/docker-compose.yml index 89a154d65..b00c83343 100644 --- a/docs/public/deploying/docker-compose.yml +++ b/docs/public/deploying/docker-compose.yml @@ -2,7 +2,7 @@ services: homeserver: - image: forgejo.ellis.link/continuwuation/continuwuity:latest + image: "forgejo.ellis.link/continuwuation/continuwuity:latest" restart: unless-stopped command: /sbin/conduwuit ports: @@ -26,6 +26,5 @@ services: # server=example.com:443 # } - volumes: db: