Merge branch 'main' into add-mariadb-healthcheck

revert Merge pull request 'Improved README' (#68) from improve-readme into main

So sorry, that was a mistake!

Reviewed-on: coop-cloud/wordpress#68

README.md

@@ -43,8 +43,13 @@ AUTHENTIK_ID_NAME=authentik_example_com_wordpress_id_v1  # the same as in authen
 
 ## Running WP-CLI
 
+You can either run using `abra app cmd`:
 `abra app cmd <app-name> app wp -- core check-update --major`
 
+Or by entering the app shell:
+1. `abra app run <app-name> app bash`
+2. `su -s /bin/bash www-data -c "wp core check-update --major"`
+
 ## Network (Multi-site)
 
 1. Set up as above

abra.sh

@@ -6,7 +6,7 @@ export HTACCESS_CONF_VERSION=v3
 export USERS_CONF_VERSION=v1
 
 wp() {
-    su -p www-data -s /bin/bash -c "/usr/local/bin/wp $@"
+    su -p www-data -s /bin/bash -c "/usr/local/bin/wp $*"
 }
 
 update() {

compose.yml

@@ -78,6 +78,12 @@ services:
     secrets:
       - db_password
       - db_root_password
+    healthcheck:
+      test: ["CMD", "mariadb-admin", "ping", "-u", "root", "-p$$(cat /run/secrets/db_root_password)", "--silent"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     deploy:
       labels:
         backupbot.backup: "${ENABLE_BACKUPS:-true}"