From f559a1d9b33d8b4b4e5b530524b9f561869d7ec0 Mon Sep 17 00:00:00 2001
From: Darren Sisson <darrensisson@hotmail.com>
Date: Tue, 8 Oct 2024 13:47:27 +0100
Subject: [PATCH 1/4] add missing live service to plane template

---
 templates/compose/plane.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/templates/compose/plane.yaml b/templates/compose/plane.yaml
index d3ff156176..69c9bef58a 100644
--- a/templates/compose/plane.yaml
+++ b/templates/compose/plane.yaml
@@ -97,6 +97,19 @@ services:
       timeout: 10s
       retries: 15
 
+  live:
+    <<: *app-env
+    image: makeplane/plane-live:stable
+    command: node live/dist/server.js live
+    depends_on:
+      - api
+      - web
+    healthcheck:
+      test: ["CMD", "echo", "hey whats up"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
+
   api:
     <<: *app-env
     image: makeplane/plane-backend:stable

From 8dfba32c307e005c993559e351db651212c7627c Mon Sep 17 00:00:00 2001
From: Darren Sisson <darrensisson@hotmail.com>
Date: Tue, 8 Oct 2024 14:02:55 +0100
Subject: [PATCH 2/4] add rabbitmq to plane template

---
 templates/compose/plane.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/templates/compose/plane.yaml b/templates/compose/plane.yaml
index 69c9bef58a..a561909b63 100644
--- a/templates/compose/plane.yaml
+++ b/templates/compose/plane.yaml
@@ -23,6 +23,15 @@ x-app-env: &app-env
     - REDIS_HOST=plane-redis
     - REDIS_PORT=6379
     - REDIS_URL=${REDIS_URL:-redis://plane-redis:6379/}
+
+    # RabbitMQ Settings
+    - RABBITMQ_HOST=plane-mq
+    - RABBITMQ_PORT=${RABBITMQ_PORT:-5672}
+    - RABBITMQ_DEFAULT_USER=${SERVICE_USER_RABBITMQ:-plane}
+    - RABBITMQ_DEFAULT_PASS=${SERVICE_PASSWORD_RABBITMQ:-plane}
+    - RABBITMQ_DEFAULT_VHOST=${RABBITMQ_VHOST:-plane}
+    - RABBITMQ_VHOST=${RABBITMQ_VHOST:-plane}
+    - 'AMQP_URL=amqp://${SERVICE_USER_RABBITMQ}:${SERVICE_PASSWORD_RABBITMQ}@$plane-mq:${RABBITMQ_PORT}/plane'
     # Application secret
     - SECRET_KEY=$SERVICE_PASSWORD_64_SECRETKEY
     # DATA STORE SETTINGS
@@ -191,6 +200,18 @@ services:
       timeout: 20s
       retries: 10
 
+  plane-mq:
+    <<: *app-env
+    image: rabbitmq:3.13.6-management-alpine
+    restart: always
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
+      timeout: 30s
+      retries: 3
+
   plane-minio:
     <<: *app-env
     image: minio/minio:latest

From 97ce097c1f4ff9dddd4da5f0e76a9f6c15c3346f Mon Sep 17 00:00:00 2001
From: Darren Sisson <darrensisson@hotmail.com>
Date: Tue, 8 Oct 2024 14:16:55 +0100
Subject: [PATCH 3/4] fix plane template

---
 templates/compose/plane.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/compose/plane.yaml b/templates/compose/plane.yaml
index a561909b63..754cc32ac7 100644
--- a/templates/compose/plane.yaml
+++ b/templates/compose/plane.yaml
@@ -46,9 +46,7 @@ x-app-env: &app-env
     - BUCKET_NAME=${BUCKET_NAME:-uploads}
     - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
     # Admin and Space URLs
-    - ADMIN_BASE_URL=${ADMIN_BASE_URL}
-    - SPACE_BASE_URL=${SPACE_BASE_URL}
-    - APP_BASE_URL=${SERVICE_FQDN_PLANE}
+    - API_BASE_URL=${API_BASE_URL:-http://api:8000}
 
 services:
   proxy:
@@ -179,7 +177,7 @@ services:
 
   plane-db:
     <<: *app-env
-    image: postgres:15.5-alpine
+    image: postgres:15.7-alpine
     command: postgres -c 'max_connections=1000'
     volumes:
       - pgdata:/var/lib/postgresql/data

From 68447ea326b513c0b72700fdded986210d8f5b4e Mon Sep 17 00:00:00 2001
From: Darren Sisson <darrensisson@hotmail.com>
Date: Tue, 8 Oct 2024 14:41:24 +0100
Subject: [PATCH 4/4] fix plane template error in url

---
 templates/compose/plane.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/compose/plane.yaml b/templates/compose/plane.yaml
index 754cc32ac7..fc62cb1224 100644
--- a/templates/compose/plane.yaml
+++ b/templates/compose/plane.yaml
@@ -31,7 +31,7 @@ x-app-env: &app-env
     - RABBITMQ_DEFAULT_PASS=${SERVICE_PASSWORD_RABBITMQ:-plane}
     - RABBITMQ_DEFAULT_VHOST=${RABBITMQ_VHOST:-plane}
     - RABBITMQ_VHOST=${RABBITMQ_VHOST:-plane}
-    - 'AMQP_URL=amqp://${SERVICE_USER_RABBITMQ}:${SERVICE_PASSWORD_RABBITMQ}@$plane-mq:${RABBITMQ_PORT}/plane'
+    - 'AMQP_URL=amqp://${SERVICE_USER_RABBITMQ}:${SERVICE_PASSWORD_RABBITMQ}@plane-mq:${RABBITMQ_PORT}/plane'
     # Application secret
     - SECRET_KEY=$SERVICE_PASSWORD_64_SECRETKEY
     # DATA STORE SETTINGS
@@ -45,7 +45,7 @@ x-app-env: &app-env
     - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
     - BUCKET_NAME=${BUCKET_NAME:-uploads}
     - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
-    # Admin and Space URLs
+    # Live server env
     - API_BASE_URL=${API_BASE_URL:-http://api:8000}
 
 services: