From 24ce5c3ec7b58c5551e9b45249f49480ba284124 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 15 Mar 2025 21:36:33 +0200
Subject: [PATCH] fixup! Upgrade MariaDB.
---
.gitlab-ci.yml | 2 +-
crond/backup | 2 +-
crond/restore | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bd13e0..bd85c5f 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 b6e3034..600bc75 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 9524bd3..b2c6603 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
--
GitLab