From 75e0bc3d88d8a2e582a2dffe1f3e1d4f5f3213cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Fri, 7 Mar 2025 13:55:15 +0800
Subject: [PATCH] feat: astrbot

---
 compose/astrbot.yml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/compose/astrbot.yml b/compose/astrbot.yml
index d793fa2..8b72ea2 100644
--- a/compose/astrbot.yml
+++ b/compose/astrbot.yml
@@ -1,9 +1,28 @@
 version: '3.8'
 
 services:
+  napcat:
+    environment:
+      - NAPCAT_UID=${NAPCAT_UID:-1000}
+      - NAPCAT_GID=${NAPCAT_GID:-1000}
+      - MODE=astrbot
+    ports:
+      - 3000:3000
+      - 3001:3001
+      - 6099:6099
+    container_name: napcat
+    restart: always
+    image: mlikiowa/napcat-docker:latest
+    volumes:
+      - ./napcat:/app/napcat
+      - ./ntqq:/app/.config/QQ
+    networks:
+      - astrbot_network
+    mac_address: "02:42:ac:11:00:02"
   astrbot:
     image: soulter/astrbot:latest
     container_name: astrbot
+    restart: always
     ports:
       - "6185:6185"
       - "6195:6195"
@@ -11,30 +30,10 @@ services:
       - "6196:6196"
       - "11451:11451"
     volumes:
-      - ./data:/AstrBot/data
-    networks:
-      - astrbot_network
-
-  napcat:
-    environment:
-      - NAPCAT_UID=${NAPCAT_UID}
-      - NAPCAT_GID=${NAPCAT_GID}
-      - MODE=astrbot
-    ports:
-      - 3000:3000
-      - 3001:3001
-      - 6099:6099
-    container_name: napcat
-    network_mode: bridge
-    restart: always
-    image: mlikiowa/napcat-docker:latest
-    volumes:
-      - ./napcat:/app/napcat/config
+      - ./napcat:/app/napcat
       - ./ntqq:/app/.config/QQ
     networks:
       - astrbot_network
-    mac_address: "02:42:ac:11:00:02"
-
 networks:
   astrbot_network:
     driver: bridge
\ No newline at end of file