Merge: 合并远程仓库更新,采纳远程版本选择

This commit is contained in:
arch3rPro
2026-01-07 16:26:03 +08:00
28 changed files with 1047 additions and 3 deletions

View File

@@ -1,6 +1,10 @@
services:
new-api:
<<<<<<<< HEAD:apps/new-api/0.10.5/docker-compose.yml
image: calciumion/new-api:v0.10.5
========
image: calciumion/new-api:v0.10.4
>>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/new-api/0.10.3/docker-compose.yml
container_name: ${CONTAINER_NAME}
restart: always
ports:

View File

@@ -1,6 +1,6 @@
services:
new-api:
image: calciumion/new-api:v0.10.0
image: calciumion/new-api:v0.10.4
container_name: ${CONTAINER_NAME}
restart: always
ports: