From b387db1e08112ab0a0ebc80b329fe98dfbf4879d Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Mon, 18 Aug 2025 13:29:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9C=E7=A8=8B=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile.dev | 32 ++++++++++++++++++++++++++++++++ README.md | 6 +++++- docker-compose.dev.yml | 26 ++++++++++++++++++++++++++ docker-compose.yml | 18 ------------------ 4 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 Dockerfile.dev create mode 100644 docker-compose.dev.yml diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 0000000..d6ce3a3 --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,32 @@ +# 使用官方的paddle镜像作为基础 +FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlex/paddlex:paddlex3.1.2-paddlepaddle3.0.0-gpu-cuda12.6-cudnn9.5-trt10.5 + +# 设置工作目录 +WORKDIR /app + +# 设置环境变量 +ENV PYTHONUNBUFFERED=1 \ + # 设置时区 + TZ=Asia/Shanghai \ + # 设置pip镜像地址,加快安装速度 + PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple + +# 安装openssh-server和apt-transport-https +RUN apt update && \ + apt install -y openssh-server + +# 配置SSH服务 +RUN mkdir /var/run/sshd && \ + # 设置root密码,可根据需要修改 + echo 'root:fcb0102' | chpasswd && \ + # 允许root登录SSH + sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \ + +# 将当前目录内容复制到容器的/app内 +#COPY . /app + +# 暴露22端口 +EXPOSE 22 + +# 启动SSH服务 +CMD ["/usr/sbin/sshd", "-D"] \ No newline at end of file diff --git a/README.md b/README.md index f0305dc..86ded16 100644 --- a/README.md +++ b/README.md @@ -125,4 +125,8 @@ bash update.sh 1. 新增文档检测功能 2. 新增扭曲矫正功能 21. 版本号:1.14.0 - 1. 新增二维码识别替换高清图片功能 \ No newline at end of file + 1. 新增二维码识别替换高清图片功能 +22. 版本号:1.15.0 + 1. 新增图片清晰度测试 +23. 版本号:1.16.0 + 1. 更新paddle框架至3.0 \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..9a55846 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,26 @@ +services: + fcb_ai_dev: + image: fcb_ai_dev:0.0.1 + build: + context: . + dockerfile: Dockerfile.dev + # 容器名称,可自定义 + container_name: fcb_ai_dev + hostname: fcb_ai_dev + # 始终重启容器 + restart: always + # 端口映射,根据需要修改主机端口 + ports: + - "8022:22" + # 数据卷映射,根据实际路径修改 + volumes: + - ./log:/app/log + - ./model:/app/model + # 启用GPU支持 + deploy: + resources: + reservations: + devices: + - device_ids: [ '0', '1' ] + capabilities: [ 'gpu' ] + driver: 'nvidia' \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 687427a..4b8e985 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,24 +31,6 @@ x-mask: driver: 'nvidia' services: -# det_api: -# <<: *template -# build: -# context: . -# container_name: det_api -# hostname: det_api -# volumes: -# - ./log:/app/log -# - ./model:/app/model -## command: [ 'det_api.py' ] -# deploy: -# resources: -# reservations: -# devices: -# - device_ids: [ '0' ] -# capabilities: [ 'gpu' ] -# driver: 'nvidia' - photo_review_1: <<: *review_template build: