From e18d9ca9b8e56cbe070cee55f797c11aeb387791 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sat, 12 Dec 2020 20:31:57 +0200
Subject: [PATCH] Upgraded MariaDB image to version 1.2.0

---
 app/tasks/install.php                     | 4 ++--
 app/views/install/compose.phtml           | 2 +-
 docker-compose.nginx.yml                  | 2 +-
 docker-compose.yml                        | 2 +-
 tests/resources/docker/docker-compose.yml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/tasks/install.php b/app/tasks/install.php
index cd7e2a096..b28391d6d 100644
--- a/app/tasks/install.php
+++ b/app/tasks/install.php
@@ -143,9 +143,9 @@ $cli
         $stdout = '';
         $stderr = '';
 
-        Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans\"");
+        Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
 
-        $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans", '', $stdout, $stderr);
+        $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
 
         if ($exit !== 0) {
             Console::error("Failed to install Appwrite dockers");
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index a97cd7882..9c4bf293e 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -267,7 +267,7 @@ services:
       - _APP_REDIS_PORT
 
   mariadb:
-    image: appwrite/mariadb:1.1.0 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml
index 845978fb8..9388c9939 100644
--- a/docker-compose.nginx.yml
+++ b/docker-compose.nginx.yml
@@ -88,7 +88,7 @@ services:
       - _APP_SMTP_PORT=25
 
   mariadb:
-    image: appwrite/mariadb:1.1.0 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
diff --git a/docker-compose.yml b/docker-compose.yml
index 72d791fa9..ed3e94bea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -293,7 +293,7 @@ services:
       - _APP_REDIS_PORT
 
   mariadb:
-    image: appwrite/mariadb:1.1.0 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml
index eacb4ec1a..7d82a8399 100644
--- a/tests/resources/docker/docker-compose.yml
+++ b/tests/resources/docker/docker-compose.yml
@@ -275,7 +275,7 @@ services:
       - _APP_REDIS_PORT
 
   mariadb:
-    image: appwrite/mariadb:1.1.0 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks: