Compare commits
	
		
			12 Commits
		
	
	
		
			2.13.0+6.7
			...
			main
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 97b9b99e93 | |||
| 
						
						
							
						
						cf2a5077c9
	
				 | 
					
					
						|||
| 74282d5658 | |||
| ab7716bf1e | |||
| b0cc5a49a1 | |||
| 3cca5d2cf3 | |||
| f403648cf6 | |||
| 83f724a316 | |||
| e6b9f8117f | |||
| e7aef38d3b | |||
| e08838561d | |||
| 04d26a59a9 | 
@ -37,7 +37,7 @@ steps:
 | 
			
		||||
        from_secret: drone_abra-bot_token
 | 
			
		||||
      fork: true
 | 
			
		||||
      repositories:
 | 
			
		||||
        - coop-cloud/auto-recipes-catalogue-json
 | 
			
		||||
        - toolshed/auto-recipes-catalogue-json
 | 
			
		||||
 | 
			
		||||
trigger:
 | 
			
		||||
  event: tag
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										11
									
								
								.env.sample
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								.env.sample
									
									
									
									
									
								
							@ -69,6 +69,10 @@ SECRET_DB_PASSWORD_VERSION=v1
 | 
			
		||||
#SECRET_AUTHENTIK_ID_VERSION=v1
 | 
			
		||||
#LOGIN_TYPE='auto'
 | 
			
		||||
 | 
			
		||||
# Matrix .well-known redirect
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
 | 
			
		||||
#MATRIX_DOMAIN=matrix.example.com
 | 
			
		||||
 | 
			
		||||
# Allow remote connections to db
 | 
			
		||||
# 🚩🚩 dangerous, use only for development sites!
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.public-db.yml
 | 
			
		||||
@ -81,3 +85,10 @@ SECRET_DB_PASSWORD_VERSION=v1
 | 
			
		||||
# FTP
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp.yml"
 | 
			
		||||
#SECRET_FTP_PASS_VERSION=v1
 | 
			
		||||
# You can use a Port between 2220-2225
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2220.yml"
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2221.yml"
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2222.yml"
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2223.yml"
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2224.yml"
 | 
			
		||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2225.yml"
 | 
			
		||||
 | 
			
		||||
@ -10,3 +10,7 @@ authentik:
 | 
			
		||||
    shared_secrets:
 | 
			
		||||
        wordpress_secret: authentik_secret
 | 
			
		||||
        wordpress_id: authentik_id
 | 
			
		||||
matrix:
 | 
			
		||||
    uncomment:
 | 
			
		||||
        - compose.matrix.yml
 | 
			
		||||
        - MATRIX_DOMAIN
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2220.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2220.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2220:22
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2221.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2221.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2221:22
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2222.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2222.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2222:22
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2223.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2223.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2223:22
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2224.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2224.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2224:22
 | 
			
		||||
							
								
								
									
										7
									
								
								compose.ftp-2225.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.ftp-2225.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  ftp:
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2220:22
 | 
			
		||||
@ -6,8 +6,6 @@ services:
 | 
			
		||||
    image: atmoz/sftp
 | 
			
		||||
    secrets:
 | 
			
		||||
      - ftp_pass
 | 
			
		||||
    ports:
 | 
			
		||||
        - 2222:22
 | 
			
		||||
    volumes:
 | 
			
		||||
      - "wordpress_content:/home/ftp_user/wp-content"
 | 
			
		||||
    configs:
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								compose.matrix.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								compose.matrix.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  app:
 | 
			
		||||
    deploy:
 | 
			
		||||
      labels:
 | 
			
		||||
        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect-matrix-well-known"
 | 
			
		||||
        - "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.regex=^https://(.*)/.well-known/matrix/(.*)"
 | 
			
		||||
        - "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.replacement=https://${MATRIX_DOMAIN}/.well-known/matrix/$$2"
 | 
			
		||||
@ -3,7 +3,7 @@ version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  app:
 | 
			
		||||
    image: "wordpress:6.7.1"
 | 
			
		||||
    image: "wordpress:6.8.3"
 | 
			
		||||
    volumes:
 | 
			
		||||
      - "wordpress_content:/var/www/html/wp-content/"
 | 
			
		||||
    networks:
 | 
			
		||||
@ -62,10 +62,10 @@ services:
 | 
			
		||||
        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}"
 | 
			
		||||
        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.version=2.13.0+6.7.1"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.version=2.16.2+6.8.3"
 | 
			
		||||
 | 
			
		||||
  db:
 | 
			
		||||
    image: "mariadb:11.6"
 | 
			
		||||
    image: "mariadb:12.0"
 | 
			
		||||
    volumes:
 | 
			
		||||
      - "mariadb:/var/lib/mysql"
 | 
			
		||||
    networks:
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1
									
								
								release/2.13.2+6.7.1
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/2.13.2+6.7.1
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
Breaking change for ftp container: you need to uncomment COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2222.yml" to open port 2222 again. You can also select between port 2220-2225.
 | 
			
		||||
		Reference in New Issue
	
	Block a user