Merge branch 'main' into opencode/witty-garden

This commit is contained in:
sagit
2026-02-06 17:15:58 +08:00
committed by GitHub
3 changed files with 26 additions and 8 deletions
+11 -3
View File
@@ -1,8 +1,12 @@
services:
backend:
image: bqlpfy/springboot-backend:2.0.7-beta
image: ghcr.io/sagit-chu/springboot-backend:2.0.7-beta
container_name: springboot-backend
restart: unless-stopped
logging:
driver: json-file
options:
max-size: "20m"
environment:
DB_PATH: /app/data/gost.db
JWT_SECRET: ${JWT_SECRET}
@@ -25,9 +29,13 @@ services:
start_period: 60s
frontend:
image: bqlpfy/vite-frontend:2.0.7-beta
image: ghcr.io/sagit-chu/vite-frontend:2.0.7-beta
container_name: vite-frontend
restart: unless-stopped
logging:
driver: json-file
options:
max-size: "20m"
ports:
- "${FRONTEND_PORT}:80"
depends_on:
@@ -52,4 +60,4 @@ networks:
driver: bridge
ipam:
config:
- subnet: 172.20.0.0/16
- subnet: 172.20.0.0/16
+11 -3
View File
@@ -1,8 +1,12 @@
services:
backend:
image: bqlpfy/springboot-backend:2.0.7-beta
image: ghcr.io/sagit-chu/springboot-backend:2.0.7-beta
container_name: springboot-backend
restart: unless-stopped
logging:
driver: json-file
options:
max-size: "20m"
environment:
DB_PATH: /app/data/gost.db
JWT_SECRET: ${JWT_SECRET}
@@ -25,9 +29,13 @@ services:
start_period: 60s
frontend:
image: bqlpfy/vite-frontend:2.0.7-beta
image: ghcr.io/sagit-chu/vite-frontend:2.0.7-beta
container_name: vite-frontend
restart: unless-stopped
logging:
driver: json-file
options:
max-size: "20m"
ports:
- "${FRONTEND_PORT}:80"
depends_on:
@@ -54,4 +62,4 @@ networks:
ipam:
config:
- subnet: 172.20.0.0/16
- subnet: fd00:dead:beef::/48
- subnet: fd00:dead:beef::/48
+4 -2
View File
@@ -295,6 +295,8 @@ After=network.target
WorkingDirectory=$INSTALL_DIR
ExecStart=$INSTALL_DIR/flux_agent
Restart=on-failure
StandardOutput=null
StandardError=null
[Install]
WantedBy=multi-user.target
@@ -312,8 +314,8 @@ EOF
echo "📁 配置目录: $INSTALL_DIR"
echo "🔧 服务状态: $(systemctl is-active flux_agent)"
else
echo "❌ flux_agent服务启动失败,请执行以下命令查看日志:"
echo "journalctl -u flux_agent -f"
echo "❌ flux_agent服务启动失败,请执行以下命令查看状态:"
echo "systemctl status flux_agent --no-pager"
fi
}