diff --git a/docker-compose.yml b/docker-compose.yml index 9d40d0a..61e271c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,7 @@ -# docker-compose.yml (生产运行版) +# docker-compose.yml (最终版 - 使用命名卷) services: - # 1. 'edge-proxy-dev' 改为 'edge-proxy' edge-proxy: - # 2. (已删除) 不再使用 'build:',我们拉取已构建的镜像 - - # 3. (已更改) 'image:' 指向您的 Gitea 注册表 image: 192.168.0.75:3000/guanyuankai/bonus-edge-proxy:latest - container_name: edge-proxy-prod platform: linux/arm64 network_mode: "host" @@ -15,7 +10,6 @@ services: - /dev/ttyS7:/dev/ttyS7 - /dev/ttyS9:/dev/ttyS9 - /dev/snd:/dev/snd - # --- VPU/NPU/RGA/GPU 硬件访问 --- - /dev/mpp_service:/dev/mpp_service - /dev/rga:/dev/rga - /dev/dri:/dev/dri @@ -27,12 +21,12 @@ services: - "110" - "29" volumes: - # 4. (已删除) - .:/app 源码挂载已移除 - - # 5. (已添加) 持久化配置目录 - # 这解决了 /app/config/config.json 找不到的问题 - # 您需要在 docker-compose.yml 旁边创建一个 'prod_config' 目录 - - ./prod_config:/app/config + # ----------------- (关键变更) ----------------- + # 不再使用 - ./prod_config:/app/config + # 改为使用 Docker 命名卷 'prod_config_data' + # 这将自动使用镜像中的 /app/config 作为初始数据 + - prod_config_data:/app/config + # ----------------- (变更结束) ----------------- - /tmp/.X11-unix:/tmp/.X11-unix:rw environment: @@ -40,11 +34,6 @@ services: dns: - 8.8.8.8 - 114.114.114.114 - - # 6. (已删除) 'command: sleep infinity' 已移除 - - # 7. (已添加) 确保 mqtt-broker 先启动 - # 这解决了 "Failed to connect to MQTT broker" 的问题 depends_on: - mqtt-broker @@ -65,4 +54,10 @@ services: volumes: - ./mosquitto/config:/mosquitto/config - ./mosquitto/data:/mosquitto/data - - ./mosquitto/log:/mosquitto/log \ No newline at end of file + - ./mosquitto/log:/mosquitto/log + +# ----------------- (关键变更) ----------------- +# 在 'services:' 之外的顶层定义 'prod_config_data' +volumes: + prod_config_data: +# ----------------- (变更结束) ----------------- \ No newline at end of file diff --git a/models/RK3588/yolov5s-640-640.rknn b/models/RK3588/yolov5s-640-640.rknn new file mode 100644 index 0000000..87419fd Binary files /dev/null and b/models/RK3588/yolov5s-640-640.rknn differ diff --git a/models/coco_80_labels_list.txt b/models/coco_80_labels_list.txt new file mode 100644 index 0000000..941cb4e --- /dev/null +++ b/models/coco_80_labels_list.txt @@ -0,0 +1,80 @@ +person +bicycle +car +motorcycle +airplane +bus +train +truck +boat +traffic light +fire hydrant +stop sign +parking meter +bench +bird +cat +dog +horse +sheep +cow +elephant +bear +zebra +giraffe +backpack +umbrella +handbag +tie +suitcase +frisbee +skis +snowboard +sports ball +kite +baseball bat +baseball glove +skateboard +surfboard +tennis racket +bottle +wine glass +cup +fork +knife +spoon +bowl +banana +apple +sandwich +orange +broccoli +carrot +hot dog +pizza +donut +cake +chair +couch +potted plant +bed +dining table +toilet +tv +laptop +mouse +remote +keyboard +cell phone +microwave +oven +toaster +sink +refrigerator +book +clock +vase +scissors +teddy bear +hair drier +toothbrush