From 1ff1105703ddb0eed4e183925b5b031b36dc88e8 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 29 Jan 2021 17:03:33 +0100
Subject: [PATCH] revert stupid change and fix it smart

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

diff --git a/app/tasks/install.php b/app/tasks/install.php
index c470bceee..1ecbc4ba3 100644
--- a/app/tasks/install.php
+++ b/app/tasks/install.php
@@ -152,9 +152,9 @@ $cli
         $stdout = '';
         $stderr = '';
 
-        Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
+        Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --env-file={$path}/.env --remove-orphans --renew-anon-volumes\"");
 
-        $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+        $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --env-file={$path}/.env --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 ee45e32e2..9d5c3d084 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -3,7 +3,6 @@
 $httpPort = $this->getParam('httpPort', '');
 $httpsPort = $this->getParam('httpsPort', '');
 $version = $this->getParam('version', '');
-$vars = $this->getParam('vars');
 ?>version: '3'
 
 services:
@@ -56,9 +55,37 @@ services:
       - clamav
       - influxdb
     environment:
-<?php foreach ($vars as $key => $value) {
-  echo '      - '.$key.'=${'.$key."}\n";
-}?>
+      - _APP_ENV
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_OPTIONS_ABUSE
+      - _APP_OPTIONS_FORCE_HTTPS
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_SMTP_HOST
+      - _APP_SMTP_PORT
+      - _APP_SMTP_SECURE
+      - _APP_SMTP_USERNAME
+      - _APP_SMTP_PASSWORD
+      - _APP_USAGE_STATS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_STORAGE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_CONTAINERS
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_MEMORY_SWAP
+      - _APP_FUNCTIONS_ENVS
 
   appwrite-worker-usage:
     image: appwrite/appwrite:<?php echo $version."\n"; ?>