From 52e2dc3182f6c1fa22a9892a355c70a1901d321b Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 18 May 2021 14:19:19 +0545
Subject: [PATCH] specify image and org name for main appwrite image

---
 app/tasks/install.php           |  4 ++--
 app/views/install/compose.phtml | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/tasks/install.php b/app/tasks/install.php
index 1f210d02fa..3312e61460 100644
--- a/app/tasks/install.php
+++ b/app/tasks/install.php
@@ -68,7 +68,7 @@ $cli
 
         if($data !== false) {
             Console::info("found old docker-compose.yml file, creating backup docker-compose.yml.backup");
-            file_put_contents($path.'/docker-compose.yml.bak',$data);
+            file_put_contents($path.'/docker-compose.yml.backup',$data);
             $compose = new Compose($data);
             $appwrite = $compose->getService('appwrite');
             $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null;
@@ -95,7 +95,7 @@ $cli
 
                 if($data !== false) { // Fetch all env vars from previous .env file
                     Console::info("found old .env file, creating .env.backup");
-                    file_put_contents($path.'/.env.bak',$data);
+                    file_put_contents($path.'/.env.backup',$data);
                     $env = new Env($data);
 
                     foreach ($env->list() as $key => $value) {
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 5d945426fb..8edc1e4bfe 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -3,6 +3,8 @@
 $httpPort = $this->getParam('httpPort', '');
 $httpsPort = $this->getParam('httpsPort', '');
 $version = $this->getParam('version', '');
+$organization = $this->getParam('organization', '');
+$image = $this->getParam('image', '');
 ?>version: '3'
 
 services:
@@ -162,7 +164,7 @@ services:
       - _APP_DB_PASS
 
   appwrite-worker-tasks:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: worker-tasks
     container_name: appwrite-worker-tasks
     restart: unless-stopped
@@ -331,7 +333,7 @@ services:
       - _APP_REDIS_PASS
 
   mariadb:
-    image: <?php echo $organization; ?>/mariadb:1.2.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:
@@ -355,7 +357,7 @@ services:
       - appwrite-redis:/data:rw
 
 #  clamav:
-#    image: <?php echo $organization; ?>/clamav:1.2.0
+#    image: appwrite/clamav:1.2.0
 #    container_name: appwrite-clamav
 #    restart: unless-stopped
 #    networks:
@@ -373,7 +375,7 @@ services:
       - appwrite-influxdb:/var/lib/influxdb:rw
 
   telegraf:
-    image: <?php echo $organization; ?>/telegraf:1.0.0
+    image: appwrite/telegraf:1.0.0
     container_name: appwrite-telegraf
     restart: unless-stopped
     networks: