From 80b99ea146c814288a2d32bbbc7eb2886df0d7c6 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Fri, 28 Jan 2022 04:17:59 +0400
Subject: [PATCH] feat: added build mount to deletes worker

---
 app/workers/deletes.php | 11 ++++++-----
 docker-compose.yml      |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 57c6f7a6db..37fe8db3af 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -310,15 +310,16 @@ class DeletesV1 extends Worker
     protected function deleteFunction(Document $document, string $projectId): void
     {
         $dbForProject = $this->getProjectDB($projectId);
-        $device = new Local(APP_STORAGE_FUNCTIONS . '/app-' . $projectId);
+        $storageFunctions = new Local(APP_STORAGE_FUNCTIONS . '/app-' . $projectId);
+        $storageBuilds = new Local(APP_STORAGE_BUILDS . '/app-' . $projectId);
         $deploymentIds = [];
         
         // Delete Deployments
         $this->deleteByGroup('deployments', [
             new Query('functionId', Query::TYPE_EQUAL, [$document->getId()])
-        ], $dbForProject, function (Document $document) use ($device, &$deploymentIds) {
+        ], $dbForProject, function (Document $document) use ($storageFunctions, &$deploymentIds) {
             $deploymentIds[] = $document->getId();
-            if ($device->delete($document->getAttribute('path', ''), true)) {
+            if ($storageFunctions->delete($document->getAttribute('path', ''), true)) {
                 Console::success('Delete deployment files: ' . $document->getAttribute('path', ''));
             } else {
                 Console::error('Failed to delete deployment files: ' . $document->getAttribute('path', ''));
@@ -328,8 +329,8 @@ class DeletesV1 extends Worker
         // Delete builds
         $this->deleteByGroup('builds', [
             new Query('deploymentId', Query::TYPE_EQUAL, $deploymentIds)
-        ], $dbForProject, function (Document $document) use ($device) {
-            if ($device->delete($document->getAttribute('outputPath', ''), true)) {
+        ], $dbForProject, function (Document $document) use ($storageBuilds) {
+            if ($storageBuilds->delete($document->getAttribute('outputPath', ''), true)) {
                 Console::success('Deleted build files: ' . $document->getAttribute('outputPath', ''));
             } else {
                 Console::error('Failed to delete build files: ' . $document->getAttribute('outputPath', ''));
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ad9d203fe..3b4ea3a636 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,6 +66,7 @@ services:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
       - ./psalm.xml:/usr/src/code/psalm.xml
       - ./tests:/usr/src/code/tests
@@ -238,6 +239,7 @@ services:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
@@ -398,6 +400,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
       - /tmp:/tmp:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
@@ -697,6 +700,7 @@ volumes:
   appwrite-uploads:
   appwrite-certificates:
   appwrite-functions:
+  appwrite-builds:
   appwrite-influxdb:
   appwrite-config:
   appwrite-executor: