chore: publish 3.1.2+25.0.4-fpm release

[ci skip]

.drone.yml

@@ -3,7 +3,7 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: nextcloud

README.md

@@ -21,9 +21,9 @@ Fully automated luxury Nextcloud via docker-swarm.
 2. Deploy [`coop-cloud/traefik`]
 3. `abra app new nextcloud --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
+5. `abra app deploy YOURAPPDOMAIN`
 
 ## How do I customise the default home page when logging in?
 
@@ -33,11 +33,11 @@ Fully automated luxury Nextcloud via docker-swarm.
 
 ## Running `occ`
 
-`abra app run --user www-data YOURAPPDOMAIN app occ user:list --help`
+`abra app run --user www-data YOURAPPDOMAIN app php occ user:list --help`
 
 ## Upgrading Nextcloud apps
 
-`abra app run --user www-data YOURAPPDOMAIN app occ app:update --all`
+`abra app run --user www-data YOURAPPDOMAIN app php occ app:update --all`
 
 ## How do I fix a Nextcloud version snafu?
 

compose.mariadb.yml

@@ -31,6 +31,12 @@ services:
           backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /tmp/backup/backup.sql'
           backupbot.backup.post-hook: "rm -rf /tmp/backup"
           backupbot.backup.path: "/tmp/backup/"
+    healthcheck:
+      test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
 configs:
   my_tune:
     name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: nginx:1.23.2
+    image: nginx:1.23.3
     configs:
       - source: nginx_conf
         target: /etc/nginx/nginx.conf
@@ -33,9 +33,15 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+    healthcheck:
+      test: ["CMD-SHELL", 'curl -s -N curl -Ns localhost/status.php |  grep "installed\":true"']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5m
 
   app:
-    image: nextcloud:25.0.1-fpm
+    image: nextcloud:25.0.4-fpm
     depends_on:
       - db
     configs:
@@ -80,12 +86,18 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=3.0.1+25.0.1-fpm"
+        - "coop-cloud.${STACK_NAME}.version=3.1.2+25.0.4-fpm"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
+    healthcheck:
+      test: ["CMD-SHELL", 'SCRIPT_NAME=status SCRIPT_FILENAME=/var/www/html/status.php REQUEST_METHOD=GET cgi-fcgi -bind -connect 127.0.0.1:9000 | grep "installed\":true"']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5m
 
   cron:
-    image: nextcloud:25.0.1-fpm
+    image: nextcloud:25.0.4-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -97,11 +109,16 @@ services:
     entrypoint: /cron.sh
 
   cache:
-    image: redis:7.0.5-alpine
+    image: redis:7.0.9-alpine
     networks:
       - internal
     volumes:
       - "redis:/data"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 3s
+      timeout: 5s
+      retries: 20
 
 secrets:
   db_root_password:

entrypoint.sh.tmpl

@@ -34,6 +34,8 @@ if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Ht
 fi
 {{ end }}
 
+# Required for healthcheck
+which cgi-fcgi > /dev/null || (apt-get update && apt-get install -y libfcgi-bin)
 
 
 /entrypoint.sh php-fpm

releases/3.1.0+25.0.1-fpm

@@ -26,6 +26,7 @@ Add SMTP Config to your .env file:
 # MAIL_FROM_ADDRESS=
 # MAIL_DOMAIN=
 # SECRET_SMTP_PASSWORD_VERSION=v1
+abra app secret insert example.com smtp_password v1 example_password
 ```
 
 
@@ -36,6 +37,21 @@ Some Apps can also be managed with abra app cmd!
 ```
 # COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
 # APPS="calendar sociallogin onlyoffice"
+abra app cmd example.com app install_apps
 # ONLYOFFICE_URL=https://onlyoffice.example.com
+# SECRET_ONLYOFFICE_JWT_VERSION=v1
+abra app secret insert example.com onlyoffice_jwt v1 example_password
+abra app cmd example.com app install_onlyoffice
 # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
+# SECRET_BBB_SECRET_VERSION=v1
+abra app secret insert example.com bbb_secret v1 example_password
+abra app cmd example.com app install_bbb
 ```
+
+## Set Quota
+
+```
+# DEFAULT_QUOTA="10 GB"
+abra app cmd example.com app set_default_quota
+```
+