Commit 24ce5c3e authored by nimrod's avatar nimrod
Browse files

fixup! Upgrade MariaDB.

parent 8f088eb4

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -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

crond/backup

+1 −1
Original line number Diff line number Diff line
@@ -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

crond/restore

+2 −2
Original line number Diff line number Diff line
@@ -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