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

apps/new-api/0.10.3/docker-compose.yml

@@ -0,0 +1,24 @@
+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:
+      - ${PANEL_APP_PORT_HTTP}:3000
+    networks:
+      - 1panel-network
+    command: --log-dir /app/logs
+    volumes:
+      - ./data:/data
+      - ./logs:/app/logs
+    environment:
+      - TZ=${TZ}
+    labels:
+      createdBy: Apps
+networks:
+  1panel-network:
+    external: true