From e00dfb44c16a326f52c5018046519a4c610ce2ee Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 25 Aug 2021 11:48:05 +0200
Subject: [PATCH 1/2] fix(install): safe installation on custom compose

---
 app/tasks/install.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/tasks/install.php b/app/tasks/install.php
index 483f5c5e04..44d3e9f603 100644
--- a/app/tasks/install.php
+++ b/app/tasks/install.php
@@ -73,7 +73,15 @@ $cli
             $compose = new Compose($data);
             $appwrite = $compose->getService('appwrite');
             $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null;
-            $ports = $compose->getService('traefik')->getPorts();
+            try {
+                $ports = $compose->getService('traefik')->getPorts();
+            } catch (\Throwable $th) {
+                $ports = [
+                    $defaultHTTPPort => $defaultHTTPPort,
+                    $defaultHTTPSPort => $defaultHTTPSPort
+                ];
+                Console::warning('Traefik not found.');
+            }
 
             if($oldVersion) {
                 foreach($compose->getServices() as $service) { // Fetch all env vars from previous compose file
@@ -171,7 +179,7 @@ $cli
             ->setParam('organization', $organization)
             ->setParam('image', $image)
         ;
-        
+
         $templateForEnv
             ->setParam('vars', $input)
         ;

From 915dd536d8451fe5935ce0dbbebd1c83de55734b Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 25 Aug 2021 12:01:01 +0200
Subject: [PATCH 2/2] fix(install): better warning with missing traefik

---
 app/tasks/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/tasks/install.php b/app/tasks/install.php
index 44d3e9f603..0898ae67c1 100644
--- a/app/tasks/install.php
+++ b/app/tasks/install.php
@@ -80,7 +80,7 @@ $cli
                     $defaultHTTPPort => $defaultHTTPPort,
                     $defaultHTTPSPort => $defaultHTTPSPort
                 ];
-                Console::warning('Traefik not found.');
+                Console::warning('Traefik not found. Falling back to default ports.');
             }
 
             if($oldVersion) {