mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-05 09:36:37 +08:00
Merge branch 'main' into opencode/witty-garden
This commit is contained in:
+10
-2
@@ -1,8 +1,12 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
image: bqlpfy/springboot-backend:2.0.7-beta
|
image: ghcr.io/sagit-chu/springboot-backend:2.0.7-beta
|
||||||
container_name: springboot-backend
|
container_name: springboot-backend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "20m"
|
||||||
environment:
|
environment:
|
||||||
DB_PATH: /app/data/gost.db
|
DB_PATH: /app/data/gost.db
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
@@ -25,9 +29,13 @@ services:
|
|||||||
start_period: 60s
|
start_period: 60s
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
image: bqlpfy/vite-frontend:2.0.7-beta
|
image: ghcr.io/sagit-chu/vite-frontend:2.0.7-beta
|
||||||
container_name: vite-frontend
|
container_name: vite-frontend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "20m"
|
||||||
ports:
|
ports:
|
||||||
- "${FRONTEND_PORT}:80"
|
- "${FRONTEND_PORT}:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
+10
-2
@@ -1,8 +1,12 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
image: bqlpfy/springboot-backend:2.0.7-beta
|
image: ghcr.io/sagit-chu/springboot-backend:2.0.7-beta
|
||||||
container_name: springboot-backend
|
container_name: springboot-backend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "20m"
|
||||||
environment:
|
environment:
|
||||||
DB_PATH: /app/data/gost.db
|
DB_PATH: /app/data/gost.db
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
@@ -25,9 +29,13 @@ services:
|
|||||||
start_period: 60s
|
start_period: 60s
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
image: bqlpfy/vite-frontend:2.0.7-beta
|
image: ghcr.io/sagit-chu/vite-frontend:2.0.7-beta
|
||||||
container_name: vite-frontend
|
container_name: vite-frontend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "20m"
|
||||||
ports:
|
ports:
|
||||||
- "${FRONTEND_PORT}:80"
|
- "${FRONTEND_PORT}:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
+4
-2
@@ -295,6 +295,8 @@ After=network.target
|
|||||||
WorkingDirectory=$INSTALL_DIR
|
WorkingDirectory=$INSTALL_DIR
|
||||||
ExecStart=$INSTALL_DIR/flux_agent
|
ExecStart=$INSTALL_DIR/flux_agent
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
StandardOutput=null
|
||||||
|
StandardError=null
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
@@ -312,8 +314,8 @@ EOF
|
|||||||
echo "📁 配置目录: $INSTALL_DIR"
|
echo "📁 配置目录: $INSTALL_DIR"
|
||||||
echo "🔧 服务状态: $(systemctl is-active flux_agent)"
|
echo "🔧 服务状态: $(systemctl is-active flux_agent)"
|
||||||
else
|
else
|
||||||
echo "❌ flux_agent服务启动失败,请执行以下命令查看日志:"
|
echo "❌ flux_agent服务启动失败,请执行以下命令查看状态:"
|
||||||
echo "journalctl -u flux_agent -f"
|
echo "systemctl status flux_agent --no-pager"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user