From 3ad265ce56d6dd8fbe1eaef8185ca64e265e8daa Mon Sep 17 00:00:00 2001
From: Nick Sellen <git@nicksellen.co.uk>
Date: Mon, 24 Jun 2024 23:22:43 +0100
Subject: [PATCH] Update to karrot v15.2.0

- includes plugins
---
 abra.sh     | 13 +++++++------
 compose.yml | 15 +++++++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/abra.sh b/abra.sh
index 53d13df..2f7793e 100644
--- a/abra.sh
+++ b/abra.sh
@@ -4,13 +4,14 @@ fix-permissions() {
     echo "Try adding '--user root'"
     exit 1
   fi
-  if [ ! -d /app/uploads ]; then
-    echo "error: no uploads dir!"
-    echo "Make sure to run it on the 'app' service"
-    exit 1
-  fi
-  echo "Fixing upload permissions"
+  
+  echo "Fixing permissions"
+  
   echo "Making karrot the owner of uploads"
   chown -R karrot:karrot /app/uploads
+
+  echo "Making karrot the owner of plugins"
+  chown -R karrot:karrot /app/plugins
+
   echo "Done"
 }
diff --git a/compose.yml b/compose.yml
index abf16e0..a29d882 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   web:
-    image: "codeberg.org/karrot/karrot-frontend:v15.1.1"
+    image: "codeberg.org/karrot/karrot-frontend:v15.2.0"
     depends_on:
       - app
     environment:
@@ -35,7 +35,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
 
   app:
-    image: "codeberg.org/karrot/karrot-backend:v15.1.1"
+    image: "codeberg.org/karrot/karrot-backend:v15.2.0"
     networks:
       - internal
     depends_on:
@@ -49,6 +49,7 @@ services:
       - livekit_api_secret
     volumes:
       - "app_data:/app/uploads/"
+      - "plugins_data:/app/plugins/"
     environment:
       - CSRF_TRUSTED_ORIGINS
       - DATABASE_CONN_MAX_AGE
@@ -72,6 +73,7 @@ services:
       - POSTAL_API_URL
       - POSTAL_WEBHOOK_KEY
       - PROXY_DISCOURSE_URL
+      - PLUGIN_DIR=/app/plugins/
       - REDIS_DB=0
       - REDIS_HOST=redis
       - REDIS_PORT=6379
@@ -101,12 +103,12 @@ services:
       start_period: 45s
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=1.3.0+15.1.1"
+        - "coop-cloud.${STACK_NAME}.version=1.4.0+15.2.0"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/app/uploads"
 
   worker:
-    image: "codeberg.org/karrot/karrot-backend:v15.1.1"
+    image: "codeberg.org/karrot/karrot-backend:v15.2.0"
     depends_on:
       - app
     networks:
@@ -117,6 +119,9 @@ services:
       - smtp_password
       - vapid_private_key
       - livekit_api_secret
+    volumes:
+      - "app_data:/app/uploads/"
+      - "plugins_data:/app/plugins/"
     environment:
       - DATABASE_CONN_MAX_AGE
       - DATABASE_HOST=db
@@ -133,6 +138,7 @@ services:
       - POSTAL_API_KEY
       - POSTAL_API_URL
       - POSTAL_WEBHOOK_KEY
+      - PLUGIN_DIR=/app/plugins/
       - REDIS_DB=0
       - REDIS_HOST=redis
       - REDIS_PORT=6379
@@ -210,6 +216,7 @@ secrets:
 
 volumes:
   app_data:
+  plugins_data:
   postgres_data:
   redis_data: