Compare commits

...

8 Commits

Author SHA1 Message Date
3wc
ed8646001c chore: publish 3.2.0+v2.11.25 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2025-06-20 10:38:14 +01:00
3wc
45b168789e Merge branch 'master' into feature/irc 2025-06-20 10:37:27 +01:00
3wc
7835b585fd chore: publish 3.1.1+v2.11.25 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-06-11 18:23:53 +01:00
830559895e chore: publish 3.1.0+v2.11.24 release
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-04-22 15:28:32 +02:00
ac53e9debe chore: publish 3.0.0+v2.11.22 with release note
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2025-04-22 09:27:08 +02:00
acb4c6960a feat: Switch to endpoint-mode dnsrr instead of vip
The default docker swarm endpoint mode (vip) introduces unnecessary
indirection in the communication between services, namely the
docker-proxy and a dynamic haproxy endpoint container. This commit
switches the socket-proxy service to endpoint_mode: dnsrr by default and
the traefik service when using host-mode port publishing.

I would strongly recommend considering switching to host-mode port
publishing by default, especially as most coop-cloud deployments are
single-server.

See: toolshed/organising#648

Thanks to @mirsal. Rebased and merged from the following commit.
abbb3255f8
2025-04-22 09:04:43 +02:00
3wc
8fbcab6bea Initial support for IRC, port 6697 2025-02-06 13:54:28 -05:00
abbb3255f8 Switch to endpoint-mode dnsrr instead of vip
Some checks failed
continuous-integration/drone/pr Build is failing
The default docker swarm endpoint mode (vip) introduces unnecessary
indirection in the communication between services, namely the
docker-proxy and a dynamic haproxy endpoint container. This commit
switches the socket-proxy service to endpoint_mode: dnsrr by default and
the traefik service when using host-mode port publishing.

I would strongly recommend considering switching to host-mode port
publishing by default, especially as most coop-cloud deployments are
single-server.

See: toolshed/organising#648
2024-11-27 16:42:35 +00:00
6 changed files with 22 additions and 3 deletions

View File

@ -147,3 +147,7 @@ COMPOSE_FILE="compose.yml"
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
#WEB_ALT_ENABLED=1
## Matrix
#COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml"
#IRC_ENABLED=1

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v21
export TRAEFIK_YML_VERSION=v22
export FILE_PROVIDER_YML_VERSION=v10
export ENTRYPOINT_VERSION=v4

7
compose.irc.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- IRC_ENABLED
ports:
- "6697:6697"

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "traefik:v2.11.22"
image: "traefik:v2.11.25"
# Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports
@ -47,12 +47,14 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=2.10.0+v2.11.22"
- "coop-cloud.${STACK_NAME}.version=3.2.0+v2.11.25"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
socket-proxy:
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
deploy:
endpoint_mode: dnsrr
environment:
- ALLOW_START=0
- ALLOW_STOP=0

2
release/3.0.0+v2.11.22 Normal file
View File

@ -0,0 +1,2 @@
socket-proxy: switch to endpoint-mode dnsrr instead of vip
See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50.

View File

@ -68,6 +68,10 @@ entrypoints:
compy:
address: ":9999"
{{ end }}
{{ if eq (env "IRC_ENABLED") "1" }}
irc:
address: ":6697"
{{ end }}
{{ if eq (env "METRICS_ENABLED") "1" }}
metrics:
address: ":8082"