From c29cc21259f74967234b4fc95f9cdb7d27280afd Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Fri, 11 Oct 2024 12:54:48 +0200
Subject: [PATCH] chore(compose): prepare minio and typesense for reinclusion

---
 compose/app.typesense.yml | 11 +++++------
 compose/net.minio.yml     | 12 ++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/compose/app.typesense.yml b/compose/app.typesense.yml
index afbf4645c..58c6b5b07 100644
--- a/compose/app.typesense.yml
+++ b/compose/app.typesense.yml
@@ -1,13 +1,12 @@
 services:
   typesense:
-    env_file:
-      - .env.dev
-      - .env
-    image: typesense/typesense:0.24.0
+    environment:
+      - TYPESENSE_API_KEY
+    image: typesense/typesense:0.27.1
     networks:
       - internal
     volumes:
-      - ./typesense/data:/data
-    command: --data-dir /data --enable-cors
+      - ../.state/typesense/data:/data
+    command: --data-dir /data --api-key=$${TYPESENSE_API_KEY} --enable-cors
     profiles:
       - typesense
diff --git a/compose/net.minio.yml b/compose/net.minio.yml
index d82bf2dd0..f8e180db9 100644
--- a/compose/net.minio.yml
+++ b/compose/net.minio.yml
@@ -5,8 +5,8 @@ services:
     volumes:
       - "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/minio:/data"
     environment:
-      - "MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID-access_key}"
-      - "MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY-secret_key}"
+      - "MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID:-access_key}"
+      - "MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY:-secret_key}"
       - "MINIO_HTTP_TRACE: /dev/stdout"
     ports:
       - "9000:9000"
@@ -16,12 +16,8 @@ services:
 
   api:
     depends_on:
-      - postgres
-      - minio
-      - redis
+      minio: {}
 
   celeryworker:
     depends_on:
-      - postgres
-      - minio
-      - redis
+      minio: {}