chore: publish 6.0.5+28.0.5-fpm release

Re coop-cloud/nextcloud#41

.env.sample

@@ -11,6 +11,8 @@ COMPOSE_FILE="compose.yml"
 COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 #COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
 
+#MAX_DB_CONNECTIONS=500
+
 ADMIN_USER=admin
 
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
@@ -42,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

README.md

@@ -6,10 +6,10 @@ Fully automated luxury Nextcloud via docker-swarm.
 
 <!-- metadata -->
 * **Category**: Apps
-* **Status**: 2, beta
+* **Status**: 5
 * **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
 * **Healthcheck**: Yes
-* **Backups**: No
+* **Backups**: Yes
 * **Email**: 3
 * **Tests**: 2
 * **SSO**: 1 (OAuth)
@@ -17,7 +17,6 @@ Fully automated luxury Nextcloud via docker-swarm.
 
 ## Quick start
 
-
 * `abra app new nextcloud`
 * `abra app config <app-name>`
 * `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`

abra.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
 export FPM_TUNE_VERSION=v5
-export NGINX_CONF_VERSION=v5
-export MY_CNF_VERSION=v4
+export NGINX_CONF_VERSION=v6
+export MY_CNF_VERSION=v5
 export ENTRYPOINT_VERSION=v3
+export CRONTAB_VERSION=v1
 
 run_occ() {
     su -p www-data -s /bin/sh -c "/var/www/html/occ $@"

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}

compose.fulltextsearch.yml

@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:27.1.3-fpm
+    image: nextcloud:28.0.5-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.mariadb.yml

@@ -15,6 +15,7 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
+      - MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
     configs:
       - source: my_tune
         target: /etc/mysql/conf.d/my-tune.cnf
@@ -41,6 +42,7 @@ configs:
   my_tune:
     name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
     file: my-tune.cnf
+    template_driver: golang
 
 secrets:
   db_root_password:

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}

compose.postgres.yml

@@ -11,6 +11,7 @@ services:
 
   db:
     image: "postgres:12"
+    command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
     volumes:
       - "postgres:/var/lib/postgresql/data"
     networks:

compose.yml

@@ -46,7 +46,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:28.0.2-fpm
+    image: nextcloud:28.0.5-fpm
     depends_on:
       - db
     configs:
@@ -91,7 +91,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=6.0.1+28.0.2-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/"
@@ -103,7 +103,7 @@ services:
       start_period: 15m
 
   cron:
-    image: nextcloud:28.0.2-fpm
+    image: nextcloud:28.0.5-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -113,6 +113,10 @@ services:
     networks:
       - internal
     entrypoint: /cron.sh
+    configs:
+      - source: crontab
+        target: /var/spool/cron/crontabs/www-data
+
 
   cache:
     image: redis:7.2.4-alpine
@@ -155,6 +159,9 @@ configs:
     name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
     file: entrypoint.sh.tmpl
     template_driver: golang
+  crontab:
+    name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
+    file: crontab
 
 networks:
   proxy:

crontab

@@ -0,0 +1 @@
+*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php

my-tune.cnf

@@ -13,7 +13,7 @@ key_buffer_size                = 16M
 innodb_log_file_size           = 256M
 long_query_time                = 1
 max_allowed_packet             = 256M
-max_connections                = 100
+max_connections                = {{ env "MAX_DB_CONNECTIONS" }}
 max_heap_table_size            = 64M
 max_user_connections           = 0
 myisam_recover_options         = BACKUP

nginx.conf.tmpl

@@ -11,6 +11,10 @@ events {
 
 http {
     include       /etc/nginx/mime.types;
+    # See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
+    types {
+        application/javascript js mjs;
+    }
     default_type  application/octet-stream;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '

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!