diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bd13e06374dd8eef7390c5923095e28a4ee025d..bd85c5f4dbc36c89f2006e395fd994c55ba7dfe0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ run: tags: *tags after_script: # yamllint disable rule:line-length - - docker-compose exec mysql sh -c 'mysql_upgrade -u root "--password=$MYSQL_ROOT_PASSWORD" --default-character-set=utf8mb4' + - docker-compose exec mysql sh -c 'mariadb-upgrade -u root "--password=$MYSQL_ROOT_PASSWORD" --default-character-set=utf8mb4' - docker-compose exec -u www-data nextcloud php occ db:add-missing-columns - docker-compose exec -u www-data nextcloud php occ db:add-missing-indices - docker-compose exec -u www-data nextcloud php occ db:add-missing-primary-keys diff --git a/crond/backup b/crond/backup index b6e3034b2bccb45ceb0fa67c272ad6fab5751ac6..600bc7540eed9e22be803a51e8f31c2235ec7631 100755 --- a/crond/backup +++ b/crond/backup @@ -31,7 +31,7 @@ nc_run find -maxdepth 1 -mindepth 1 \! -name "$tmpdir" -exec \ # shellcheck disable=SC2016 db_run sh -c \ - 'mysqldump --single-transaction --default-character-set=utf8mb4 --routines --add-drop-database --force "--password=$MYSQL_ROOT_PASSWORD" --user=root --databases "$MYSQL_DATABASE"' | \ + 'mariadb-dump --single-transaction --default-character-set=utf8mb4 --routines --add-drop-database --force "--password=$MYSQL_ROOT_PASSWORD" --user=root --databases "$MYSQL_DATABASE"' | \ zstd -o "$dest/mysqldump.sql.zstd" & wait diff --git a/crond/restore b/crond/restore index 9524bd310b0c833b6c01c75c963fb3c400442113..b2c6603ae126d92b7fc0d8e2ed06faec9d079d30 100755 --- a/crond/restore +++ b/crond/restore @@ -4,14 +4,14 @@ set -eux src="$1" alias nc_run='docker exec -iu www-data nextcloud-nextcloud-1' -alias db_run='docker exec -iu nobody nextcloud_mysql_1' +alias db_run='docker exec -iu nobody nextcloud-mysql-1' nc_run php occ maintenance:mode --on # shellcheck disable=SC2016 zstdcat "$src/mysqldump.sql.zstd" | \ db_run sh -c \ - '--force "--password=$MYSQL_ROOT_PASSWORD" --user=root"' + 'mariadb --force "--password=$MYSQL_ROOT_PASSWORD" --user=root"' zstdcat "$src/nextcloud_volume.tar.zstd" | \ nc_run tar -x