Skip to content
Snippets Groups Projects
Commit 24ce5c3e authored by nimrod's avatar nimrod
Browse files

fixup! Upgrade MariaDB.

parent 8f088eb4
No related branches found
No related tags found
No related merge requests found
Pipeline #4344 failed
...@@ -18,7 +18,7 @@ run: ...@@ -18,7 +18,7 @@ run:
tags: *tags tags: *tags
after_script: after_script:
# yamllint disable rule:line-length # 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-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-indices
- docker-compose exec -u www-data nextcloud php occ db:add-missing-primary-keys - docker-compose exec -u www-data nextcloud php occ db:add-missing-primary-keys
......
...@@ -31,7 +31,7 @@ nc_run find -maxdepth 1 -mindepth 1 \! -name "$tmpdir" -exec \ ...@@ -31,7 +31,7 @@ nc_run find -maxdepth 1 -mindepth 1 \! -name "$tmpdir" -exec \
# shellcheck disable=SC2016 # shellcheck disable=SC2016
db_run sh -c \ 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" & zstd -o "$dest/mysqldump.sql.zstd" &
wait wait
......
...@@ -4,14 +4,14 @@ set -eux ...@@ -4,14 +4,14 @@ set -eux
src="$1" src="$1"
alias nc_run='docker exec -iu www-data nextcloud-nextcloud-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 nc_run php occ maintenance:mode --on
# shellcheck disable=SC2016 # shellcheck disable=SC2016
zstdcat "$src/mysqldump.sql.zstd" | \ zstdcat "$src/mysqldump.sql.zstd" | \
db_run sh -c \ 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" | \ zstdcat "$src/nextcloud_volume.tar.zstd" | \
nc_run tar -x nc_run tar -x
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment