Compare commits

...

4 Commits

Author SHA1 Message Date
c930bbcf56 chore: publish 8.0.1+29.0.3-fpm release 2024-07-19 18:51:54 +02:00
0f9aba3e9e alaconnect: replace 'execute' with 'initial-hooks' 2024-07-15 13:57:58 +02:00
eb3e2486ce chore: publish 8.0.0+29.0.1-fpm release 2024-06-19 18:53:22 +02:00
2b4e63ef31 Reapply "split bbb and onlyoffice compose.yml"
This reverts commit 180c269337.
2024-06-19 18:36:05 +02:00
7 changed files with 36 additions and 26 deletions

View File

@ -44,26 +44,28 @@ DEFAULT_QUOTA="10 GB"
# MAIL_DOMAIN= # MAIL_DOMAIN=
# SECRET_SMTP_PASSWORD_VERSION=v1 # SECRET_SMTP_PASSWORD_VERSION=v1
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml" # APPS="calendar"
# APPS="calendar sociallogin onlyoffice"
#
# ONLYOFFICE_URL=https://onlyoffice.example.com
# SECRET_ONLYOFFICE_JWT_VERSION=v1
#
# COLLABORA_URL=https://collabora.example.com # COLLABORA_URL=https://collabora.example.com
#
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
# ONLYOFFICE_URL=https://onlyoffice.example.com
# APPS="$APPS onlyoffice"
# SECRET_ONLYOFFICE_JWT_VERSION=v1
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
# SECRET_BBB_SECRET_VERSION=v1 # SECRET_BBB_SECRET_VERSION=v1
#
# OCC_CMDS="app:disable dashboard"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
# APPS="$APPS sociallogin"
# AUTHENTIK_USER_PREFIX=authentik # AUTHENTIK_USER_PREFIX=authentik
# AUTHENTIK_DOMAIN=authentik.example.com # AUTHENTIK_DOMAIN=authentik.example.com
# SECRET_AUTHENTIK_SECRET_VERSION=v1 # SECRET_AUTHENTIK_SECRET_VERSION=v1
# SECRET_AUTHENTIK_ID_VERSION=v1 # SECRET_AUTHENTIK_ID_VERSION=v1
# OCC_CMDS="app:disable dashboard"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1 #SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1

View File

@ -5,19 +5,20 @@ authentik:
- AUTHENTIK_DOMAIN - AUTHENTIK_DOMAIN
- SECRET_AUTHENTIK_SECRET_VERSION - SECRET_AUTHENTIK_SECRET_VERSION
- SECRET_AUTHENTIK_ID_VERSION - SECRET_AUTHENTIK_ID_VERSION
execute: initial-hooks:
- app set_authentik - app set_authentik
shared_secrets: shared_secrets:
nextcloud_secret: authentik_secret nextcloud_secret: authentik_secret
nextcloud_id: authentik_id nextcloud_id: authentik_id
onlyoffice: onlyoffice:
uncomment: uncomment:
- compose.onlyoffice.yml
- ONLYOFFICE_URL - ONLYOFFICE_URL
- SECRET_ONLYOFFICE_JWT_VERSION - SECRET_ONLYOFFICE_JWT_VERSION
execute: initial-hooks:
- app install_onlyoffice - app install_onlyoffice
collabora: collabora:
uncomment: uncomment:
- COLLABORA_URL - COLLABORA_URL
execute: initial-hooks:
- app install_collabora - app install_collabora

12
compose.bbb.yml Normal file
View File

@ -0,0 +1,12 @@
version: "3.8"
services:
app:
secrets:
- bbb_secret
environment:
- BBB_URL
secrets:
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -2,7 +2,7 @@ version: "3.8"
services: services:
elasticsearch: elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4" image: "docker.elastic.co/elasticsearch/elasticsearch:8.14.3"
environment: environment:
- cluster.name=docker-cluster - cluster.name=docker-cluster
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
@ -29,7 +29,7 @@ services:
mode: 0600 mode: 0600
searchindexer: searchindexer:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.3-fpm
volumes: volumes:
- nextcloud:/var/www/html/ - nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached - nextapps:/var/www/html/custom_apps:cached

View File

@ -3,16 +3,10 @@ services:
app: app:
secrets: secrets:
- onlyoffice_jwt - onlyoffice_jwt
- bbb_secret
environment: environment:
- APPS
- ONLYOFFICE_URL - ONLYOFFICE_URL
- BBB_URL
secrets: secrets:
onlyoffice_jwt: onlyoffice_jwt:
external: true external: true
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION} name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
web: web:
image: nginx:1.26.1 image: nginx:1.27.0
depends_on: depends_on:
- app - app
configs: configs:
@ -46,7 +46,7 @@ services:
start_period: 5m start_period: 5m
app: app:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.3-fpm
depends_on: depends_on:
- db - db
configs: configs:
@ -91,7 +91,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: labels:
- "coop-cloud.${STACK_NAME}.version=7.0.3+29.0.1-fpm" - "coop-cloud.${STACK_NAME}.version=8.0.1+29.0.3-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true" - "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/" - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
@ -103,7 +103,7 @@ services:
start_period: 15m start_period: 15m
cron: cron:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.3-fpm
volumes: volumes:
- nextcloud:/var/www/html/ - nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached - nextapps:/var/www/html/custom_apps:cached

1
release/8.0.0+29.0.1-fpm Normal file
View File

@ -0,0 +1 @@
BREAKING CHANGE: compose.apps.yml is now split for bbb and onlyoffice, configs must be updated