From f2a337d86e9ca3d06fe0f513e9a79255f519250d Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Tue, 8 Aug 2023 17:06:46 +0300
Subject: [PATCH] varlibmysql resolve

---
 docker-compose.yml                      | 7 ++-----
 src/Appwrite/Platform/Tasks/Restore.php | 7 ++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 597d7f68e2..ab99342e2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -754,7 +754,6 @@ services:
     command: sleep infinity
     volumes:
       - ./backup-data:/backups:rw
-      - ./restore-data:/varlibmysql:rw
       - appwrite-mariadb:/var/lib/mysql:r
     networks:
       - appwrite
@@ -773,9 +772,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      - appwrite-mariadb:/var/lib/mysql:r
       - ./backup-data:/backups:rw
-
+      - appwrite-mariadb:/var/lib/mysql:r
     depends_on:
       - redis
     environment:
@@ -797,7 +795,7 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./backup-data:/backups:rw
-      - ./restore-data:/varlibmysql:rw
+      - appwrite-mariadb:/var/lib/mysql:rw
     depends_on:
       - redis
     environment:
@@ -971,5 +969,4 @@ volumes:
   appwrite-functions:
   appwrite-builds:
   #backup-data:
-  #restore-data:
   # appwrite-chronograf:
diff --git a/src/Appwrite/Platform/Tasks/Restore.php b/src/Appwrite/Platform/Tasks/Restore.php
index c36ea3f9cc..5c464c3d45 100644
--- a/src/Appwrite/Platform/Tasks/Restore.php
+++ b/src/Appwrite/Platform/Tasks/Restore.php
@@ -16,6 +16,7 @@ use Utopia\Validator\WhiteList;
 class Restore extends Action
 {
     public const BACKUPS_PATH = '/backups';
+    public const DATADIR = '/var/lib/mysql';
     public const PROCESSORS = 4;
     protected ?DSN $dsn = null;
     protected string $database;
@@ -30,8 +31,7 @@ class Restore extends Action
             ->param('id', '', new Text(20), 'The backup identification')
             ->param('cloud', null, new WhiteList(['true', 'false'], true), 'Download backup from cloud or use local directory')
             ->param('database', null, new Text(10), 'The Database name for example db_fra1_01')
-            ->param('datadir', null, new Text(100), 'The Path where database would be stored')
-            ->callback(fn ($id, $cloud, $project, $datadir) => $this->action($id, $cloud, $project, $datadir));
+            ->callback(fn ($id, $cloud, $project) => $this->action($id, $cloud, $project));
     }
 
     public static function getName(): string
@@ -39,11 +39,12 @@ class Restore extends Action
         return 'restore';
     }
 
-    public function action(string $id, string $cloud, string $database, string $datadir): void
+    public function action(string $id, string $cloud, string $database): void
     {
         $this->database = $database;
         $this->dsn = $this->getDsn($database);
         $this->s3 = new DOSpaces('/' . $database . '/full', App::getEnv('_DO_SPACES_ACCESS_KEY'), App::getEnv('_DO_SPACES_SECRET_KEY'), App::getEnv('_DO_SPACES_BUCKET_NAME'), App::getEnv('_DO_SPACES_REGION'));
+        $datadir = self::DATADIR;
 
         if (is_null($this->dsn)) {
             Console::error('No DSN match');