forked from coop-cloud/traefik
		
	Compare commits
	
		
			9 Commits
		
	
	
		
			2.6.0+v2.1
			...
			3.0.0+v3.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8bf744d4c9 | |||
| b7ea50d6aa | |||
| af33ec8510 | |||
| 685d32baf1 | |||
| e76d61be00 | |||
| daec338066 | |||
| e92e76ac88 | |||
| 70d10587bc | |||
| bdf84fcefd | 
| @ -16,8 +16,8 @@ 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: v4 |       TRAEFIK_YML_VERSION: v5 | ||||||
|       FILE_PROVIDER_YML_VERSION: v3 |       FILE_PROVIDER_YML_VERSION: v4 | ||||||
|       ENTRYPOINT_VERSION: v1 |       ENTRYPOINT_VERSION: v1 | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
|  | |||||||
| @ -46,6 +46,11 @@ COMPOSE_FILE="compose.yml" | |||||||
| #GANDI_ENABLED=1 | #GANDI_ENABLED=1 | ||||||
| #SECRET_GANDIV5_API_KEY_VERSION=v1 | #SECRET_GANDIV5_API_KEY_VERSION=v1 | ||||||
|  |  | ||||||
|  | ## DigitalOcean, https://digitalocean.com | ||||||
|  | #COMPOSE_FILE="$COMPOSE_FILE:compose.digitalocean.yml" | ||||||
|  | #DIGITALOCEAN_ENABLED=1 | ||||||
|  | #SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1 | ||||||
|  |  | ||||||
| ##################################################################### | ##################################################################### | ||||||
| # Manual wildcard certificate insertion                             # | # Manual wildcard certificate insertion                             # | ||||||
| ##################################################################### | ##################################################################### | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								abra.sh
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | |||||||
| export TRAEFIK_YML_VERSION=v19 | export TRAEFIK_YML_VERSION=v21 | ||||||
| export FILE_PROVIDER_YML_VERSION=v9 | export FILE_PROVIDER_YML_VERSION=v10 | ||||||
| export ENTRYPOINT_VERSION=v2 | export ENTRYPOINT_VERSION=v3 | ||||||
|  | |||||||
							
								
								
									
										15
									
								
								compose.digitalocean.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								compose.digitalocean.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,15 @@ | |||||||
|  | version: "3.8" | ||||||
|  |  | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     environment: | ||||||
|  |       - DO_AUTH_TOKEN_FILE=/run/secrets/digitalocean_auth_token | ||||||
|  |       - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED | ||||||
|  |       - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER | ||||||
|  |     secrets: | ||||||
|  |       - digitalocean_auth_token | ||||||
|  |  | ||||||
|  | secrets: | ||||||
|  |   digitalocean_auth_token: | ||||||
|  |     name: ${STACK_NAME}_digitalocean_auth_token_${SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION} | ||||||
|  |     external: true | ||||||
| @ -3,7 +3,7 @@ version: "3.8" | |||||||
|  |  | ||||||
| services: | services: | ||||||
|   app: |   app: | ||||||
|     image: "traefik:v2.11.0" |     image: "traefik:v3.0.0" | ||||||
|     # 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=2.6.0+v2.11.0" |         - "coop-cloud.${STACK_NAME}.version=3.0.0+v3.0.0" | ||||||
|         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" |         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" | ||||||
|  |  | ||||||
| networks: | networks: | ||||||
|  | |||||||
| @ -11,4 +11,8 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE") | |||||||
| export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE") | export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE") | ||||||
| {{ end }} | {{ end }} | ||||||
|  |  | ||||||
|  | {{ if eq (env "DIGITALOCEAN_ENABLED") "1" }} | ||||||
|  | export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE") | ||||||
|  | {{ end }} | ||||||
|  |  | ||||||
| /entrypoint.sh "$@" | /entrypoint.sh "$@" | ||||||
|  | |||||||
| @ -3,11 +3,10 @@ log: | |||||||
|   level: {{ env "LOG_LEVEL" }} |   level: {{ env "LOG_LEVEL" }} | ||||||
|  |  | ||||||
| providers: | providers: | ||||||
|   docker: |   swarm: | ||||||
|     endpoint: "unix:///var/run/docker.sock" |     endpoint: "unix:///var/run/docker.sock" | ||||||
|     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 | ||||||
| @ -24,6 +23,10 @@ api: | |||||||
| entrypoints: | entrypoints: | ||||||
|   web: |   web: | ||||||
|     address: ":80" |     address: ":80" | ||||||
|  |     http: | ||||||
|  |       redirections: | ||||||
|  |         entryPoint: | ||||||
|  |           to: web-secure | ||||||
|   web-secure: |   web-secure: | ||||||
|     address: ":443" |     address: ":443" | ||||||
|   {{ if eq (env "GITEA_SSH_ENABLED") "1" }} |   {{ if eq (env "GITEA_SSH_ENABLED") "1" }} | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user