diff --git a/abra.sh b/abra.sh index 8e7874a..4506077 100644 --- a/abra.sh +++ b/abra.sh @@ -158,3 +158,7 @@ set_windowsfriendly_filenames() { run_occ 'config:system:set forbidden_filename_characters 5 --value=\|' run_occ 'config:system:set forbidden_filename_characters 6 --value=\"' } + +upgrade_mariadb() { + mariadb-upgrade -p`cat /run/secrets/db_root_password` +} \ No newline at end of file diff --git a/compose.mariadb.yml b/compose.mariadb.yml index f39aa1f..db9c4cc 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -9,7 +9,7 @@ services: - MYSQL_PASSWORD_FILE=/run/secrets/db_password db: - image: "mariadb:10.5" + image: "mariadb:11.4" environment: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud @@ -32,7 +32,7 @@ services: backupbot.backup.volumes.mariadb.path: "backup.sql" backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql' healthcheck: - test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping'] + test: ["CMD-SHELL", 'mariadb-admin -p"$$(cat /run/secrets/db_root_password)" ping'] interval: 30s timeout: 10s retries: 10 diff --git a/compose.yml b/compose.yml index 517e759..50f8be7 100644 --- a/compose.yml +++ b/compose.yml @@ -91,7 +91,7 @@ services: failure_action: rollback order: start-first labels: - - "coop-cloud.${STACK_NAME}.version=10.0.0+30.0.4-fpm" + - "coop-cloud.${STACK_NAME}.version=11.0.0+30.0.4-fpm" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "backupbot.backup=${ENABLE_BACKUPS:-true}" - "backupbot.backup.volumes.redis=false" diff --git a/release/11.0.0+30.0.4-fpm b/release/11.0.0+30.0.4-fpm new file mode 100644 index 0000000..c24a9c9 --- /dev/null +++ b/release/11.0.0+30.0.4-fpm @@ -0,0 +1,4 @@ +Upgrades mariadb from 10.5 to 11.4 +NOTE: If your Nextcloud instance is using mariadb, after running this update you MUST run the database upgrade command: +`abra app command nextcloud.yourserver.org db upgrade_mariadb` +More info: https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/ \ No newline at end of file