From 5ad0214a1e0058cb3c30998861d0bcc1b089c832 Mon Sep 17 00:00:00 2001
From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com>
Date: Thu, 18 Jul 2024 12:16:24 -0400
Subject: [PATCH] chore: 1.6 -> current

---
 app/http.php                  | 22 +++++-----------------
 docker-compose.local.prod.yml | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/http.php b/app/http.php
index b167c553c4..853b918f33 100644
--- a/app/http.php
+++ b/app/http.php
@@ -6,6 +6,7 @@ require_once __DIR__ . '/controllers/general.php';
 use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
+use Swoole\Constant;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
@@ -45,24 +46,11 @@ $server = new Server('0.0.0.0', '80', [
     'send_yield' => true,
     'tcp_fastopen' => true,
 ]);
+$http = new Http($server, $container, 'UTC');
+$http->setRequestClass(Request::class);
+$http->setResponseClass(Response::class);
 
-$server->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
-include __DIR__ . '/controllers/general.php';
-
-global $global, $container;
-
-http::onStart()
+Http::onStart()
     ->inject('authorization')
     ->inject('cache')
     ->inject('pools')
diff --git a/docker-compose.local.prod.yml b/docker-compose.local.prod.yml
index 75f3bcbd60..055c20c862 100644
--- a/docker-compose.local.prod.yml
+++ b/docker-compose.local.prod.yml
@@ -186,6 +186,27 @@ services:
       - _APP_CONSOLE_COUNTRIES_DENYLIST
       - _APP_EXPERIMENT_LOGGING_PROVIDER
       - _APP_EXPERIMENT_LOGGING_CONFIG
+  appwrite-console:
+    <<: *x-logging
+    container_name: appwrite-console
+    image: appwrite/console:5.0.0-rc.5
+    restart: unless-stopped
+    networks:
+      - appwrite
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_console.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_http.service=appwrite_console
+      # wss
+      - traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_https.service=appwrite_console
+      - traefik.http.routers.appwrite_console_https.tls=true
 
   appwrite-realtime:
     entrypoint: realtime