Compare commits
	
		
			27 Commits
		
	
	
		
			2.9.0+v2.1
			...
			v3-log-max
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 304915a396 | |||
| 8d7f9bd6a2 | |||
| 01c5b2a3a4 | |||
| 810e1b0502 | |||
| 270af60ba4 | |||
| 27dfc1ae2c | |||
| 2ff2c0d59e | |||
| 60ec1191a8 | |||
| 
						
						
							
						
						ff351d4c7f
	
				 | 
					
					
						|||
| 4a5cfddb4c | |||
| ed8646001c | |||
| 45b168789e | |||
| 7835b585fd | |||
| 830559895e | |||
| 
						
						
							
						
						ac53e9debe
	
				 | 
					
					
						|||
| 
						
						
							
						
						acb4c6960a
	
				 | 
					
					
						|||
| 22578d1e8e | |||
| 55ad530fb7 | |||
| 54fe45da2f | |||
| e21dbc655a | |||
| b9d825b5c5 | |||
| 74b3ee6716 | |||
| 14d5d79520 | |||
| 7185e6ab43 | |||
| 8fbcab6bea | |||
| 85d0c159b0 | |||
| 
						
						
							
						
						abbb3255f8
	
				 | 
					
					
						
@ -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:
 | 
				
			||||||
@ -34,7 +34,7 @@ steps:
 | 
				
			|||||||
        from_secret: drone_abra-bot_token
 | 
					        from_secret: drone_abra-bot_token
 | 
				
			||||||
      fork: true
 | 
					      fork: true
 | 
				
			||||||
      repositories:
 | 
					      repositories:
 | 
				
			||||||
        - coop-cloud/auto-recipes-catalogue-json
 | 
					        - toolshed/auto-recipes-catalogue-json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
trigger:
 | 
					trigger:
 | 
				
			||||||
  event: tag
 | 
					  event: tag
 | 
				
			||||||
 | 
				
			|||||||
@ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 | 
				
			|||||||
# DASHBOARD_ENABLED=true
 | 
					# DASHBOARD_ENABLED=true
 | 
				
			||||||
# WARN, INFO etc.
 | 
					# WARN, INFO etc.
 | 
				
			||||||
LOG_LEVEL=WARN
 | 
					LOG_LEVEL=WARN
 | 
				
			||||||
 | 
					LOG_MAX_AGE=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This is here so later lines can extend it; you likely don't wanna edit
 | 
					# This is here so later lines can extend it; you likely don't wanna edit
 | 
				
			||||||
COMPOSE_FILE="compose.yml"
 | 
					COMPOSE_FILE="compose.yml"
 | 
				
			||||||
@ -147,3 +148,7 @@ COMPOSE_FILE="compose.yml"
 | 
				
			|||||||
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 | 
					# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 | 
				
			||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 | 
					#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 | 
				
			||||||
#WEB_ALT_ENABLED=1
 | 
					#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=v21
 | 
					export TRAEFIK_YML_VERSION=v24
 | 
				
			||||||
export FILE_PROVIDER_YML_VERSION=v10
 | 
					export FILE_PROVIDER_YML_VERSION=v10
 | 
				
			||||||
export ENTRYPOINT_VERSION=v4
 | 
					export ENTRYPOINT_VERSION=v4
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										7
									
								
								compose.irc.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.irc.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
				
			|||||||
 | 
					version: "3.8"
 | 
				
			||||||
 | 
					services:
 | 
				
			||||||
 | 
					  app:
 | 
				
			||||||
 | 
					    environment:
 | 
				
			||||||
 | 
					      - IRC_ENABLED
 | 
				
			||||||
 | 
					    ports:
 | 
				
			||||||
 | 
					      - "6697:6697"
 | 
				
			||||||
@ -3,7 +3,7 @@ version: "3.8"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  app:
 | 
					  app:
 | 
				
			||||||
    image: "traefik:v2.11.14"
 | 
					    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
 | 
				
			||||||
@ -27,6 +27,7 @@ services:
 | 
				
			|||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - DASHBOARD_ENABLED
 | 
					      - DASHBOARD_ENABLED
 | 
				
			||||||
      - LOG_LEVEL
 | 
					      - LOG_LEVEL
 | 
				
			||||||
 | 
					      - ${LOG_MAX_AGE:-0}
 | 
				
			||||||
    healthcheck:
 | 
					    healthcheck:
 | 
				
			||||||
      test: ["CMD", "traefik", "healthcheck"]
 | 
					      test: ["CMD", "traefik", "healthcheck"]
 | 
				
			||||||
      interval: 30s
 | 
					      interval: 30s
 | 
				
			||||||
@ -47,12 +48,14 @@ 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=2.9.0+v2.11.14"
 | 
					        - "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}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  socket-proxy:
 | 
					  socket-proxy:
 | 
				
			||||||
    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
 | 
					    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
 | 
				
			||||||
 | 
					    deploy:
 | 
				
			||||||
 | 
					      endpoint_mode: dnsrr
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - ALLOW_START=0
 | 
					      - ALLOW_START=0
 | 
				
			||||||
      - ALLOW_STOP=0
 | 
					      - ALLOW_STOP=0
 | 
				
			||||||
@ -76,7 +79,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/2.9.1+v2.11.14
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/2.9.1+v2.11.14
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					Reverts max log retention
 | 
				
			||||||
							
								
								
									
										2
									
								
								release/3.0.0+v2.11.22
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								release/3.0.0+v2.11.22
									
									
									
									
									
										Normal 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.
 | 
				
			||||||
							
								
								
									
										1
									
								
								release/3.3.0+v2.11.26
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										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
									
								
							
							
						
						
									
										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
									
								
							
							
						
						
									
										1
									
								
								release/3.4.2+v3.4.5
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					Bumps the TRAEFIK_YML_VERSION
 | 
				
			||||||
@ -1,13 +1,16 @@
 | 
				
			|||||||
---
 | 
					---
 | 
				
			||||||
 | 
					core:
 | 
				
			||||||
 | 
					  defaultRuleSyntax: v2
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
log:
 | 
					log:
 | 
				
			||||||
  level: {{ env "LOG_LEVEL" }}
 | 
					  level: {{ env "LOG_LEVEL" }}
 | 
				
			||||||
 | 
					  maxAge: {{ env "LOG_MAX_AGE" }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
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
 | 
				
			||||||
@ -68,6 +71,10 @@ entrypoints:
 | 
				
			|||||||
  compy:
 | 
					  compy:
 | 
				
			||||||
    address: ":9999"
 | 
					    address: ":9999"
 | 
				
			||||||
  {{ end }}
 | 
					  {{ end }}
 | 
				
			||||||
 | 
					  {{ if eq (env "IRC_ENABLED") "1" }}
 | 
				
			||||||
 | 
					  irc:
 | 
				
			||||||
 | 
					    address: ":6697"
 | 
				
			||||||
 | 
					  {{ end }}
 | 
				
			||||||
  {{ if eq (env "METRICS_ENABLED") "1" }}
 | 
					  {{ if eq (env "METRICS_ENABLED") "1" }}
 | 
				
			||||||
  metrics:
 | 
					  metrics:
 | 
				
			||||||
    address: ":8082"
 | 
					    address: ":8082"
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user