Compare commits

...

8 Commits

7 changed files with 13 additions and 8 deletions

@ -8,7 +8,7 @@ steps:
host: swarm-test.autonomic.zone host: swarm-test.autonomic.zone
stack: traefik stack: traefik
networks: networks:
- proxy - proxy
deploy_key: deploy_key:
from_secret: drone_ssh_swarm_test from_secret: drone_ssh_swarm_test
environment: environment:
@ -16,7 +16,7 @@ steps:
STACK_NAME: traefik STACK_NAME: traefik
LETS_ENCRYPT_ENV: production LETS_ENCRYPT_ENV: production
LETS_ENCRYPT_EMAIL: helo@autonomic.zone LETS_ENCRYPT_EMAIL: helo@autonomic.zone
TRAEFIK_YML_VERSION: v21 TRAEFIK_YML_VERSION: v22
FILE_PROVIDER_YML_VERSION: v10 FILE_PROVIDER_YML_VERSION: v10
ENTRYPOINT_VERSION: v4 ENTRYPOINT_VERSION: v4
trigger: trigger:

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

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.11.25" image: "traefik:v3.4.5"
# Note(decentral1se): *please do not* add any additional ports here. # Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use # Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports # the usual `compose.$app.yml` approach for any additional ports
@ -47,7 +47,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.service=api@internal" - "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file" - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=3.1.1+v2.11.25" - "coop-cloud.${STACK_NAME}.version=3.4.2+v3.4.5"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}" - "backupbot.backup=${ENABLE_BACKUPS:-true}"
@ -78,7 +78,7 @@ services:
- SECRETS=0 - SECRETS=0
- SERVICES=1 # Needs access - SERVICES=1 # Needs access
- SESSION=0 - SESSION=0
- SWARM=0 - SWARM=1
- SYSTEM=0 - SYSTEM=0
- TASKS=1 # Needs access - TASKS=1 # Needs access
- VERSION=1 # Needs access - VERSION=1 # Needs access

1
release/3.3.0+v2.11.26 Normal 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

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

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

@ -1,13 +1,15 @@
--- ---
core:
defaultRuleSyntax: v2
log: log:
level: {{ env "LOG_LEVEL" }} level: {{ env "LOG_LEVEL" }}
providers: providers:
docker: swarm:
endpoint: "tcp://socket-proxy:2375" endpoint: "tcp://socket-proxy:2375"
exposedByDefault: false exposedByDefault: false
network: proxy network: proxy
swarmMode: true
{{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }} {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
file: file:
directory: /etc/traefik/file-providers directory: /etc/traefik/file-providers