Merge pull request 'upgrade to mariadb 11.4' (#45) from MIR/nextcloud:main into main
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #45
This commit is contained in:
marlon 2024-12-22 21:32:37 +00:00
commit d72a8fdcdb
4 changed files with 11 additions and 3 deletions

View File

@ -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 5 --value=\|'
run_occ 'config:system:set forbidden_filename_characters 6 --value=\"' run_occ 'config:system:set forbidden_filename_characters 6 --value=\"'
} }
upgrade_mariadb() {
mariadb-upgrade -p`cat /run/secrets/db_root_password`
}

View File

@ -9,7 +9,7 @@ services:
- MYSQL_PASSWORD_FILE=/run/secrets/db_password - MYSQL_PASSWORD_FILE=/run/secrets/db_password
db: db:
image: "mariadb:10.5" image: "mariadb:11.4"
environment: environment:
- MYSQL_DATABASE=nextcloud - MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud - MYSQL_USER=nextcloud
@ -32,7 +32,7 @@ services:
backupbot.backup.volumes.mariadb.path: "backup.sql" 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' backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql'
healthcheck: 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 interval: 30s
timeout: 10s timeout: 10s
retries: 10 retries: 10

View File

@ -91,7 +91,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: 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}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}" - "backupbot.backup=${ENABLE_BACKUPS:-true}"
- "backupbot.backup.volumes.redis=false" - "backupbot.backup.volumes.redis=false"

View File

@ -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/