chore: publish 3.4.0+v3.4.4 release

Merge pull request 'update to traefik v3' (#54 ) from sixsmith/traefik:v3-update-only into master
Reviewed-on: coop-cloud/traefik#54
2025-07-23 23:14:01 -04:00 · 2025-07-23 00:06:45 +00:00 · 2025-07-15 15:57:41 -07:00 · 2025-07-01 20:02:30 +02:00 · 2025-07-01 19:40:44 +02:00 · 2025-06-20 10:38:14 +01:00
9 changed files with 31 additions and 8 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -16,7 +16,7 @@ steps:
      STACK_NAME: traefik
      LETS_ENCRYPT_ENV: production
      LETS_ENCRYPT_EMAIL: helo@autonomic.zone
-      TRAEFIK_YML_VERSION: v21
+      TRAEFIK_YML_VERSION: v22
      FILE_PROVIDER_YML_VERSION: v10
      ENTRYPOINT_VERSION: v4
 trigger:
--- a/.env.sample
+++ b/.env.sample
@ -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
--- a/abra.sh
+++ b/abra.sh
@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v21
+export TRAEFIK_YML_VERSION=v22
 export FILE_PROVIDER_YML_VERSION=v10
 export ENTRYPOINT_VERSION=v4
--- a/compose.irc.yml
+++ b/compose.irc.yml
@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - IRC_ENABLED
+    ports:
+      - "6697:6697"
--- a/compose.yml
+++ b/compose.yml
@ -3,7 +3,7 @@ version: "3.8"

 services:
  app:
-    image: "traefik:v2.11.14"
+    image: "traefik:v3.4.4"
    # 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.9.1+v2.11.14"
+        - "coop-cloud.${STACK_NAME}.version=3.3.0+v2.11.26"
        - "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
@ -76,7 +78,7 @@ services:
      - SECRETS=0
      - SERVICES=1 # Needs access
      - SESSION=0
-      - SWARM=0
+      - SWARM=1
      - SYSTEM=0
      - TASKS=1 # Needs access
      - VERSION=1 # Needs access
--- a/release/3.0.0+v2.11.22
+++ b/release/3.0.0+v2.11.22
@ -0,0 +1,2 @@
+socket-proxy: switch to endpoint-mode dnsrr instead of vip
+See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50.
--- a/release/3.3.0+v2.11.26
+++ b/release/3.3.0+v2.11.26
@ -0,0 +1 @@
+Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5
--- a/release/3.4.0+v3.4.4
+++ b/release/3.4.0+v3.4.4
@ -0,0 +1 @@
+Updates Traefik from v2 to v3. Migration notes here: https://doc.traefik.io/traefik/migration/v2-to-v3-details/#configuration-details-for-migrating-from-traefik-v2-to-v3 By default, syntax for Traefik rules in recipes still use v2 syntax. To upgrade a recipe to use v3 label syntax, set the ruleSyntax label in the recipe per: https://doc.traefik.io/traefik/reference/routing-configuration/http/router/rules-and-priority/#rulesyntax
--- a/traefik.yml.tmpl
+++ b/traefik.yml.tmpl
@ -1,13 +1,15 @@
 ---
+core:
+  defaultRuleSyntax: v2
+ 
 log:
  level: {{ env "LOG_LEVEL" }}

 providers:
-  docker:
+  swarm:
    endpoint: "tcp://socket-proxy:2375"
    exposedByDefault: false
    network: proxy
-    swarmMode: true
  {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
  file:
    directory: /etc/traefik/file-providers
@ -68,6 +70,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"
Author	SHA1	Message	Date
marlon	27dfc1ae2c	chore: publish 3.4.0+v3.4.4 release	2025-07-23 23:14:01 -04:00
Brooke	2ff2c0d59e	Merge pull request 'update to traefik v3' (#54 ) from sixsmith/traefik:v3-update-only into master Reviewed-on: coop-cloud/traefik#54	2025-07-23 00:06:45 +00:00
Raghav	60ec1191a8	v3: update Traefik	2025-07-15 15:57:41 -07:00
Moritz	ff351d4c7f	fix drone	2025-07-01 20:02:30 +02:00
Moritz	4a5cfddb4c	chore: publish 3.3.0+v2.11.26 release	2025-07-01 19:40:44 +02:00
3wc	ed8646001c	chore: publish 3.2.0+v2.11.25 release	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	2025-06-11 18:23:53 +01:00
Moritz	830559895e	chore: publish 3.1.0+v2.11.24 release	2025-04-22 15:28:32 +02:00
decentral1se	ac53e9debe	chore: publish 3.0.0+v2.11.22 with release note	2025-04-22 09:27:08 +02:00
decentral1se	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
Simon	22578d1e8e	chore: publish 2.10.0+v2.11.22 release	2025-04-01 16:00:35 +02:00
3wc	8fbcab6bea	Initial support for IRC, port 6697	2025-02-06 13:54:28 -05:00
mirsal	abbb3255f8	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	2024-11-27 16:42:35 +00:00
				`@ -0,0 +1 @@`
				`Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5`
				`@ -0,0 +1 @@`
				`Updates Traefik from v2 to v3. Migration notes here: https://doc.traefik.io/traefik/migration/v2-to-v3-details/#configuration-details-for-migrating-from-traefik-v2-to-v3 By default, syntax for Traefik rules in recipes still use v2 syntax. To upgrade a recipe to use v3 label syntax, set the ruleSyntax label in the recipe per: https://doc.traefik.io/traefik/reference/routing-configuration/http/router/rules-and-priority/#rulesyntax`