From 202e4c01d8f4054b9b359892e2d4110296d6f7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 21 Nov 2022 14:23:43 +0000
Subject: [PATCH 1/2] Add new executor env vars

---
 .env                            |  1 +
 app/config/variables.php        | 11 ++++++++++-
 app/views/install/compose.phtml |  1 +
 docker-compose.yml              |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 15a25aa933..4656731909 100644
--- a/.env
+++ b/.env
@@ -53,6 +53,7 @@ _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
diff --git a/app/config/variables.php b/app/config/variables.php
index 1eb2688c62..474ec70d66 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -877,7 +877,16 @@ return [
                 'required' => false,
                 'question' => '',
                 'filter' => ''
-            ]
+            ],
+            [
+                'name' => '_APP_FUNCTIONS_MAINTENANCE_INTERVAL',
+                'description' => 'Interval how often executor checks for inactive runimes. The default value is 60 seconds.',
+                'introduction' => '1.2.0',
+                'default' => '60',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
         ],
     ],
     [
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index dc7549aa3f..c1939c46c2 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -558,6 +558,7 @@ services:
     environment:
       - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_CONNECTIONS_STORAGE
       - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
       - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
diff --git a/docker-compose.yml b/docker-compose.yml
index cb18dff4ea..82b85ba733 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -650,6 +650,7 @@ services:
     environment:
       - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_CONNECTIONS_STORAGE
       - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
       - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD

From e20b2f33403a6c246c02506f42dd59366eefb432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 21 Nov 2022 14:55:57 +0000
Subject: [PATCH 2/2] Upgrade OPR images

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 82b85ba733..59661a15c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -638,7 +638,7 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.1.4
+    image: openruntimes/executor:0.1.6
     networks:
       - appwrite
       - runtimes