From 142e8f878d8239487ec42c69bf9eaf615bd122c0 Mon Sep 17 00:00:00 2001
From: adrien <adrien.bouvais.pro@gmail.com>
Date: Fri, 20 Jun 2025 17:11:01 +0000
Subject: [PATCH] Removed affine for siyuan, added minio for DVC

---
 apps.yml           | 58 ++++++++++++----------------------------------
 databases.yml      | 29 -----------------------
 docker-compose.yml | 27 ++++++++++++++++++++-
 3 files changed, 41 insertions(+), 73 deletions(-)
 delete mode 100644 databases.yml

diff --git a/apps.yml b/apps.yml
index 7afb8ba..50eda9d 100644
--- a/apps.yml
+++ b/apps.yml
@@ -20,11 +20,10 @@ services:
       - '107' #render
       - '44' #video
     volumes:
-      - "./cache/jellyfin:/cache"
-      - "./hdd0/jellyfin:/config"
-      - "./hdd0/media:/media"
+      - "./cache/jellyfin/cache:/cache"
+      - "./hdd0/jellyfin/config:/config"
       - type: bind
-        source: /data/media
+        source: ./hdd0/media
         target: /media
     labels:
       - "traefik.enable=true"
@@ -88,46 +87,19 @@ services:
       - "traefik.http.routers.vaultwarden-admin.middlewares=auth@docker"
       - "traefik.http.routers.vaultwarden-admin.service=my-vaultwarden-service@docker"
 
-  affine:
-    image: ghcr.io/toeverything/affine-graphql:stable
-    container_name: affine
-    restart: unless-stopped
-    depends_on:
-      redis:
-        condition: service_healthy
-      postgres:
-        condition: service_healthy
-      affine_migration:
-        condition: service_completed_successfully
+  siyuan:
+    image: b3log/siyuan
+    command: ['--workspace=/siyuan/workspace/']
     volumes:
-      - /home/adrien/Web-stack/hdd0/affine/storage:/root/.affine/storage
-      - /home/adrien/Web-stack/config/affine:/root/.affine/config
+      - /siyuan/workspace:/siyuan/workspace
+      - "./hdd0/siyuan/workspace:/siyuan/workspace"
+    restart: unless-stopped
     environment:
-      - REDIS_SERVER_HOST=redis
-      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/affine
-      - AFFINE_INDEXER_ENABLED=false
-      - AFFINE_SERVER_EXTERNAL_URL=https://affine.bouvais.lu
+      - TZ=Europe/Luxembourg
+      - SIYUAN_ACCESS_AUTH_CODE=${SIYUAN_ACCESS_AUTH_CODE}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.affine.rule=Host(`affine.bouvais.lu`)"
-      - "traefik.http.routers.affine.entrypoints=websecure"
-      - "traefik.http.routers.affine.tls.certresolver=myresolver"
-      - "traefik.http.services.affine.loadbalancer.server.port=3010"
-
-  affine_migration:
-    image: ghcr.io/toeverything/affine-graphql:stable
-    container_name: affine_migration
-    volumes:
-      # custom configurations
-      - /home/adrien/Web-stack/hdd0/affine/storage:/root/.affine/storage
-      - /home/adrien/Web-stack/config/affine:/root/.affine/config
-    command: ['sh', '-c', 'node ./scripts/self-host-predeploy.js']
-    environment:
-      - REDIS_SERVER_HOST=redis
-      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/affine
-      - AFFINE_INDEXER_ENABLED=false
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - "traefik.http.routers.siyuan.rule=Host(`notes.bouvais.lu`)"
+      - "traefik.http.routers.siyuan.entrypoints=websecure"
+      - "traefik.http.routers.siyuan.tls.certresolver=myresolver"
+      - "traefik.http.services.siyuan.loadbalancer.server.port=6806"
diff --git a/databases.yml b/databases.yml
deleted file mode 100644
index a55e287..0000000
--- a/databases.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-services:
-  redis:
-    image: redis
-    container_name: redis
-    healthcheck:
-      test: ['CMD', 'redis-cli', '--raw', 'incr', 'ping']
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: unless-stopped
-
-  postgres:
-    image: pgvector/pgvector:pg16
-    container_name: postgres
-    volumes:
-      - /home/adrien/Web-stack/hdd0/postgres:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: affine
-      POSTGRES_INITDB_ARGS: '--data-checksums'
-      POSTGRES_HOST_AUTH_METHOD: trust
-    healthcheck:
-      test:
-        ['CMD', 'pg_isready', '-U', "${DB_USERNAME}", '-d', "affine"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index e059614..cbf2d48 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 include:
-  - databases.yml
   - apps.yml
   - gitea.yml
   - monitoring.yml
@@ -110,3 +109,29 @@ services:
       - "traefik.http.routers.kopia.entrypoints=websecure"
       - "traefik.http.routers.kopia.tls.certresolver=myresolver"
       - "traefik.http.services.kopia.loadbalancer.server.port=51515"
+
+  minio:
+    image: minio/minio:latest
+    container_name: minio
+    restart: unless-stopped
+    environment:
+      MINIO_ROOT_USER: adrien
+      MINIO_ROOT_PASSWORD: ${MASTER_PASSWORD}
+    command: server /data --console-address ":9001"
+    volumes:
+      - ./hdd0/minio_data:/data
+    labels:
+      - "traefik.enable=true"
+      # Router and service for the MinIO API
+      - "traefik.http.routers.minio-api.rule=Host(`minio-api.bouvais.lu`)"
+      - "traefik.http.routers.minio-api.entrypoints=websecure"
+      - "traefik.http.routers.minio-api.tls.certresolver=myresolver"
+      - "traefik.http.services.minio-api-service.loadbalancer.server.port=9000"
+      - "traefik.http.routers.minio-api.service=minio-api-service"
+
+      # Router and service for the MinIO Console (WebUI)
+      - "traefik.http.routers.minio-console.rule=Host(`minio-console.bouvais.lu`)"
+      - "traefik.http.routers.minio-console.entrypoints=websecure"
+      - "traefik.http.routers.minio-console.tls.certresolver=myresolver"
+      - "traefik.http.services.minio-console-service.loadbalancer.server.port=9001"
+      - "traefik.http.routers.minio-console.service=minio-console-service"