Compare commits

..

14 Commits

9 changed files with 24 additions and 6 deletions

View File

@ -8,7 +8,7 @@ steps:
host: swarm-test.autonomic.zone
stack: traefik
networks:
- proxy
- proxy
deploy_key:
from_secret: drone_ssh_swarm_test
environment:
@ -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:

View File

@ -148,3 +148,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=v22
export TRAEFIK_YML_VERSION=v24
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:v3.4.4"
image: "traefik:v3.4.5"
# 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
@ -27,7 +27,7 @@ services:
environment:
- DASHBOARD_ENABLED
- LOG_LEVEL
- LOG_MAX_AGE
- ${LOG_MAX_AGE:-0}
healthcheck:
test: ["CMD", "traefik", "healthcheck"]
interval: 30s
@ -48,7 +48,7 @@ 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=3.1.0+v2.11.24"
- "coop-cloud.${STACK_NAME}.version=3.4.2+v3.4.5"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}"

1
release/3.3.0+v2.11.26 Normal file
View File

@ -0,0 +1 @@
Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5

1
release/3.4.0+v3.4.4 Normal file
View File

@ -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

1
release/3.4.2+v3.4.5 Normal file
View File

@ -0,0 +1 @@
Bumps the TRAEFIK_YML_VERSION

View File

@ -71,6 +71,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"