From f4edb06d537c427d9923c46ff5bba99cfa292737 Mon Sep 17 00:00:00 2001
From: Simon <simonthiessen@posteo.de>
Date: Wed, 19 Jun 2024 16:49:07 +0200
Subject: [PATCH] chore: publish 6.0.5+28.0.5-fpm release

---
 .env.sample                                | 24 ++++++++++++----------
 compose.bbb.yml                            | 12 +++++++++++
 compose.apps.yml => compose.onlyoffice.yml |  6 ------
 compose.yml                                |  2 +-
 release/6.0.5+28.0.5-fpm                   |  1 +
 5 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 compose.bbb.yml
 rename compose.apps.yml => compose.onlyoffice.yml (61%)
 create mode 100644 release/6.0.5+28.0.5-fpm

diff --git a/.env.sample b/.env.sample
index cb3b8d7..79dd4b8 100644
--- a/.env.sample
+++ b/.env.sample
@@ -44,26 +44,28 @@ DEFAULT_QUOTA="10 GB"
 # MAIL_DOMAIN=
 # SECRET_SMTP_PASSWORD_VERSION=v1
 
-# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
-# APPS="calendar sociallogin onlyoffice"
-#
-# ONLYOFFICE_URL=https://onlyoffice.example.com
-# SECRET_ONLYOFFICE_JWT_VERSION=v1
-#
+# APPS="calendar"
+
 # 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!
 # 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"
+# APPS="$APPS sociallogin"
 # AUTHENTIK_USER_PREFIX=authentik
 # AUTHENTIK_DOMAIN=authentik.example.com
 # SECRET_AUTHENTIK_SECRET_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"
 #SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
diff --git a/compose.bbb.yml b/compose.bbb.yml
new file mode 100644
index 0000000..fcd7e37
--- /dev/null
+++ b/compose.bbb.yml
@@ -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}
diff --git a/compose.apps.yml b/compose.onlyoffice.yml
similarity index 61%
rename from compose.apps.yml
rename to compose.onlyoffice.yml
index b892636..f1bcb24 100644
--- a/compose.apps.yml
+++ b/compose.onlyoffice.yml
@@ -3,16 +3,10 @@ services:
   app:
     secrets:
       - onlyoffice_jwt
-      - bbb_secret
     environment:
-      - APPS
       - ONLYOFFICE_URL
-      - BBB_URL
 
 secrets:
   onlyoffice_jwt:
     external: true
     name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
-  bbb_secret:
-    external: true
-    name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}
diff --git a/compose.yml b/compose.yml
index 6e86cb7..55ab5e2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -91,7 +91,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=6.0.4+28.0.5-fpm"
+        - "coop-cloud.${STACK_NAME}.version=6.0.5+28.0.5-fpm"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
diff --git a/release/6.0.5+28.0.5-fpm b/release/6.0.5+28.0.5-fpm
new file mode 100644
index 0000000..ac18cc8
--- /dev/null
+++ b/release/6.0.5+28.0.5-fpm
@@ -0,0 +1 @@
+BREAKING CHANGE: compose.apps.yml was split to compose.bbb.yml and compose.onlyoffice.yml, configuration update is required!
\ No newline at end of file