From aebd0ed8469894b2cdc118f4a481079623edac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 4 Apr 2022 08:14:14 +0000
Subject: [PATCH] PR review changes

---
 .env                            |  2 +-
 app/config/variables.php        | 11 ++++++++++-
 app/executor.php                |  2 +-
 app/views/install/compose.phtml |  2 +-
 docker-compose.yml              |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index a6bea88b02..0d7a2e9650 100644
--- a/.env
+++ b/.env
@@ -53,7 +53,7 @@ _APP_FUNCTIONS_CPUS=0
 _APP_FUNCTIONS_MEMORY=0
 _APP_FUNCTIONS_MEMORY_SWAP=0
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=60
-_APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes
+OPEN_RUNTIMES_NETWORK=appwrite_runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
diff --git a/app/config/variables.php b/app/config/variables.php
index c741cb5486..63321a4a8a 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -599,7 +599,7 @@ return [
             ],
             [
                 'name' => '_APP_EXECUTOR_RUNTIME_NETWORK',
-                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'description' => 'Deprecated with 0.14.0, use \'OPEN_RUNTIMES_NETWORK\' instead!',
                 'introduction' => '0.13.0',
                 'default' => 'appwrite_runtimes',
                 'required' => false,
@@ -651,6 +651,15 @@ return [
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => 'OPEN_RUNTIMES_NETWORK',
+                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'introduction' => '0.13.0',
+                'default' => 'appwrite_runtimes',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
         ],
         [
             'category' => 'Maintenance',
diff --git a/app/executor.php b/app/executor.php
index d28123c224..e9f4c21391 100644
--- a/app/executor.php
+++ b/app/executor.php
@@ -233,7 +233,7 @@ App::post('/v1/runtimes')
                 throw new Exception('Failed to create build container', 500);
             }
 
-            $orchestration->networkConnect($runtimeId, App::getEnv('_APP_EXECUTOR_RUNTIME_NETWORK', 'appwrite_runtimes'));
+            $orchestration->networkConnect($runtimeId, App::getEnv('OPEN_RUNTIMES_NETWORK', 'appwrite_runtimes'));
 
             /** 
              * Execute any commands if they were provided
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 5740c8680d..221f372330 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -396,7 +396,7 @@ services:
       - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_INACTIVE_THRESHOLD
       - _APP_EXECUTOR_SECRET
-      - _APP_EXECUTOR_RUNTIME_NETWORK
+      - OPEN_RUNTIMES_NETWORK
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
       - _APP_STORAGE_DEVICE
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ddd5dd51b..154c3b1369 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -454,7 +454,7 @@ services:
       - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_INACTIVE_THRESHOLD
       - _APP_EXECUTOR_SECRET
-      - _APP_EXECUTOR_RUNTIME_NETWORK
+      - OPEN_RUNTIMES_NETWORK
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
       - _APP_STORAGE_DEVICE