From 2a5bc6f3bb3b26b4fc51e7c7bf6d7f9d2c2172f3 Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Tue, 6 Sep 2022 09:45:45 -0700 Subject: [PATCH] enable mariadb auto upgrade (#1814) * enable mariadb auto upgrade This fixes after-upgrade issues, for example: [ERROR] Incorrect definition of table mysql.event: expected column 'definer' at position 3 to have type varchar(, found type char(141). The upgrade only happens when necessary. I also disabled the system database backup because I assume users create and test their own backups. Signed-off-by: Adam Monsen * use 1s instead of "yesplease" Any nonzero value is valid for these environment variables. Signed-off-by: Adam Monsen Signed-off-by: Adam Monsen --- .../docker-compose/insecure/mariadb/apache/docker-compose.yml | 2 ++ .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 2 ++ .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 2 ++ .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml index 70ed73bb..d5e30393 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml @@ -9,6 +9,8 @@ services: - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD= + - MARIADB_AUTO_UPGRADE=1 + - MARIADB_DISABLE_UPGRADE_BACKUP=1 env_file: - db.env diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index 44c79485..c3c94f39 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml @@ -9,6 +9,8 @@ services: - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD= + - MARIADB_AUTO_UPGRADE=1 + - MARIADB_DISABLE_UPGRADE_BACKUP=1 env_file: - db.env diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml index 84e91a41..eaf18678 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml @@ -9,6 +9,8 @@ services: - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD= + - MARIADB_AUTO_UPGRADE=1 + - MARIADB_DISABLE_UPGRADE_BACKUP=1 env_file: - db.env diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml index 33b3d92b..80088993 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml @@ -9,6 +9,8 @@ services: - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD= + - MARIADB_AUTO_UPGRADE=1 + - MARIADB_DISABLE_UPGRADE_BACKUP=1 env_file: - db.env