From 79616049d07e3669268b1330ffa0fab6a5a0af83 Mon Sep 17 00:00:00 2001
From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com>
Date: Fri, 17 May 2024 15:03:00 +0530
Subject: [PATCH 1/5] Update executor image name

---
 app/views/install/compose.phtml | 2 +-
 docker-compose.yml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 53e7e71518..711b46733f 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -727,7 +727,7 @@ services:
 
   openruntimes-executor:
     container_name: openruntimes-executor
-    hostname: appwrite-executor
+    hostname: exc1
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
diff --git a/docker-compose.yml b/docker-compose.yml
index d270074412..0ce4ab6d7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -847,7 +847,7 @@ services:
 
   openruntimes-executor:
     container_name: openruntimes-executor
-    hostname: appwrite-executor
+    hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
     image: openruntimes/executor:0.4.12
@@ -913,7 +913,7 @@ services:
       - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
       - OPR_PROXY_ALGORITHM=random
-      - OPR_PROXY_EXECUTORS=appwrite-executor
+      - OPR_PROXY_EXECUTORS=exc1
       - OPR_PROXY_HEALTHCHECK_INTERVAL=10000
       - OPR_PROXY_MAX_TIMEOUT=600
       - OPR_PROXY_HEALTHCHECK=enabled

From ca1f760905d879290ca2f4f2565755fca49193eb Mon Sep 17 00:00:00 2001
From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com>
Date: Fri, 24 May 2024 12:55:32 +0530
Subject: [PATCH 2/5] Update executor hostname in variables

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

diff --git a/app/config/variables.php b/app/config/variables.php
index 185ab29d0c..8412b9ebe6 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -767,7 +767,7 @@ return [
                 'name' => '_APP_EXECUTOR_HOST',
                 'description' => 'The host used by Appwrite to communicate with the function executor!',
                 'introduction' => '0.13.0',
-                'default' => 'http://appwrite-executor/v1',
+                'default' => 'http://exc1/v1',
                 'required' => false,
                 'overwrite' => true,
                 'question' => '',

From 2005ddfe47fd9a4835de4722d1c862ad92446bb0 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Fri, 24 May 2024 07:25:39 +0000
Subject: [PATCH 3/5] chore: update env variable

---
 CHANGES.md               | 6 ++++++
 app/config/variables.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f106f97301..f78d186209 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+# Version 1.5.7
+## What's Changed
+
+## Fixes
+* Change executor hostname back to exc1 to prevent name too long errors in the swoole table [#8147](https://github.com/appwrite/appwrite/pull/8147)
+
 # Version 1.5.5
 ## What's Changed
 ### Notable changes
diff --git a/app/config/variables.php b/app/config/variables.php
index 185ab29d0c..8412b9ebe6 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -767,7 +767,7 @@ return [
                 'name' => '_APP_EXECUTOR_HOST',
                 'description' => 'The host used by Appwrite to communicate with the function executor!',
                 'introduction' => '0.13.0',
-                'default' => 'http://appwrite-executor/v1',
+                'default' => 'http://exc1/v1',
                 'required' => false,
                 'overwrite' => true,
                 'question' => '',

From 02acee9e2b5ae1bb2cd17725d33b0b3f9fb5c9c6 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Fri, 24 May 2024 09:51:28 +0000
Subject: [PATCH 4/5] chore: fix merge conflicts

---
 CHANGES.md  | 9 +++++++--
 app/console | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7cc8ab71ea..21b27cd4a1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
-# Version 1.5.7
+# Version 1.5.6
+## What's Changed
+
+### Fixes
+* Change executor hostname back to exc1 to prevent name too long errors in the swoole table [#8147](https://github.com/appwrite/appwrite/pull/8147)
+
+# Version 1.5.6
 ## What's Changed
 
 ### Notable Changes
@@ -17,7 +23,6 @@
 * Fix Deprecated Warning in Doctor.php in [#8105](https://github.com/appwrite/appwrite/pull/8105)
 * Set limit to retrieve all stats for the usage range in [#8117](https://github.com/appwrite/appwrite/pull/8117)
 * Fix email used for name when user is created via Apple OAuth2 in [#8102](https://github.com/appwrite/appwrite/pull/8102)
-* Change executor hostname back to exc1 to prevent name too long errors in the swoole table [#8147](https://github.com/appwrite/appwrite/pull/8147)
 
 ### Miscellaneous
 
diff --git a/app/console b/app/console
index 0af1af4852..d751874580 160000
--- a/app/console
+++ b/app/console
@@ -1 +1 @@
-Subproject commit 0af1af4852bfe4d9b234c74524b3f7592094e85f
+Subproject commit d75187458097a20b9e693079b16cb3f25933d31c

From e2667915474b979fa7ad7dc300e2057dad260836 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Fri, 24 May 2024 09:51:56 +0000
Subject: [PATCH 5/5] chore: update changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 21b27cd4a1..187731455b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-# Version 1.5.6
+# Version 1.5.7
 ## What's Changed
 
 ### Fixes