Compare commits
	
		
			1 Commits
		
	
	
		
			3.4.2+v3.4
			...
			v3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b9cf62e0ba | 
@ -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: v22
 | 
			
		||||
      TRAEFIK_YML_VERSION: v21
 | 
			
		||||
      FILE_PROVIDER_YML_VERSION: v10
 | 
			
		||||
      ENTRYPOINT_VERSION: v4
 | 
			
		||||
trigger:
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 | 
			
		||||
# DASHBOARD_ENABLED=true
 | 
			
		||||
# WARN, INFO etc.
 | 
			
		||||
LOG_LEVEL=WARN
 | 
			
		||||
LOG_MAX_AGE=1
 | 
			
		||||
 | 
			
		||||
# This is here so later lines can extend it; you likely don't wanna edit
 | 
			
		||||
COMPOSE_FILE="compose.yml"
 | 
			
		||||
@ -147,7 +148,3 @@ 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
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								abra.sh
									
									
									
									
									
								
							@ -1,3 +1,3 @@
 | 
			
		||||
export TRAEFIK_YML_VERSION=v23
 | 
			
		||||
export TRAEFIK_YML_VERSION=v22
 | 
			
		||||
export FILE_PROVIDER_YML_VERSION=v10
 | 
			
		||||
export ENTRYPOINT_VERSION=v4
 | 
			
		||||
 | 
			
		||||
@ -1,7 +0,0 @@
 | 
			
		||||
version: "3.8"
 | 
			
		||||
services:
 | 
			
		||||
  app:
 | 
			
		||||
    environment:
 | 
			
		||||
      - IRC_ENABLED
 | 
			
		||||
    ports:
 | 
			
		||||
      - "6697:6697"
 | 
			
		||||
@ -3,7 +3,7 @@ version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  app:
 | 
			
		||||
    image: "traefik:v3.4.5"
 | 
			
		||||
    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
 | 
			
		||||
@ -27,6 +27,7 @@ services:
 | 
			
		||||
    environment:
 | 
			
		||||
      - DASHBOARD_ENABLED
 | 
			
		||||
      - LOG_LEVEL
 | 
			
		||||
      - LOG_MAX_AGE
 | 
			
		||||
    healthcheck:
 | 
			
		||||
      test: ["CMD", "traefik", "healthcheck"]
 | 
			
		||||
      interval: 30s
 | 
			
		||||
@ -47,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.4.2+v3.4.5"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.version=3.1.0+v2.11.24"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
			
		||||
        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1 +0,0 @@
 | 
			
		||||
Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5
 | 
			
		||||
@ -1 +0,0 @@
 | 
			
		||||
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 +0,0 @@
 | 
			
		||||
Bumps the TRAEFIK_YML_VERSION
 | 
			
		||||
@ -4,6 +4,7 @@ core:
 | 
			
		||||
 
 | 
			
		||||
log:
 | 
			
		||||
  level: {{ env "LOG_LEVEL" }}
 | 
			
		||||
  maxAge: {{ env "LOG_MAX_AGE" }}
 | 
			
		||||
 | 
			
		||||
providers:
 | 
			
		||||
  swarm:
 | 
			
		||||
@ -70,10 +71,6 @@ entrypoints:
 | 
			
		||||
  compy:
 | 
			
		||||
    address: ":9999"
 | 
			
		||||
  {{ end }}
 | 
			
		||||
  {{ if eq (env "IRC_ENABLED") "1" }}
 | 
			
		||||
  irc:
 | 
			
		||||
    address: ":6697"
 | 
			
		||||
  {{ end }}
 | 
			
		||||
  {{ if eq (env "METRICS_ENABLED") "1" }}
 | 
			
		||||
  metrics:
 | 
			
		||||
    address: ":8082"
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user