diff --git a/dockerfile b/dockerfile index b1399ce3cf7ad4e75c1dd44f566b8394c0d6a462..abd5ba62c5e1b79a2d4a86c055ec7929599263c1 100644 --- a/dockerfile +++ b/dockerfile @@ -1,6 +1,6 @@ # 基于的基础镜像-在dockerhub找 # FROM silverlogic/python3.8 -FROM python:3.8-slim-buster +FROM python:3.7-slim-buster # 添加描述信息 MAINTAINER python3.8+drpy+supervisord by "hjdhnx" # 设置app文件夹是工作目录 @@ -31,13 +31,20 @@ ADD app.sh /etc/autostart/ # RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list # armv7安装gcc # RUN apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y -RUN chmod +x /etc/autostart/app.sh && apt-get clean && apt-get update && apt-get install -y vim +RUN chmod +x /etc/autostart/app.sh && apt-get clean && apt-get update # 执行指令,换源并安装依赖 设置默认pip源 RUN pip install -i https://mirrors.cloud.tencent.com/pypi/simple --upgrade pip \ - && pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple + && pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple \ + && pip config set global.extra-index-url https://www.piwheels.org/simple +# armv7专用 +RUN pip install gevent-21.12.0-cp37-cp37m-linux_armv7l.whl +# RUN pip install --upgrade gevent --no-cache-dir +# RUN pip install gevent-21.12.0-cp37-cp37m-linux_armv7l.whl # 执行指令,安装依赖 RUN pip install -r requirements.txt +# 安装vim编辑器 +RUN apt-get install -y vim # 切换容器时区 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone # 设置语言支持中文打印 @@ -50,6 +57,7 @@ EXPOSE 5705 9001 # docker push hjdhnx/drpy_mini # docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -f dockerfile -t hjdhnx/drpy:mini_arm64 . # docker buildx build --platform linux/arm/v7 -f dockerfile -t hjdhnx/drpy_mini:armv7 . +# docker buildx build --platform linux/arm/v7 -f dockerfile -t hjdhnx/drpy:armv7 --push . # 启动命令,非此文件内命令 # docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy:mini # docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy_mini diff --git a/gevent-21.12.0-cp37-cp37m-linux_armv7l.whl b/gevent-21.12.0-cp37-cp37m-linux_armv7l.whl new file mode 100644 index 0000000000000000000000000000000000000000..8e6344723b52f91e6452184ce2a520d7f6eb277b Binary files /dev/null and b/gevent-21.12.0-cp37-cp37m-linux_armv7l.whl differ diff --git a/requirements.txt b/requirements.txt index 47ab94085d2f258c5d022364595f6ad89e6a11d9..21fcf78b48c7e284d2f52545f3d50474e72ee0ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,10 @@ flask_migrate flask-sqlalchemy requests netifaces -gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7' -gevent==1.3.4 ; sys_platform != 'win32' and python_version >= '3.7' and python_version < '3.9' -gevent==21.12.0 ; sys_platform == 'win32' +# gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7' +# gevent==1.3.4 ; sys_platform != 'win32' and python_version >= '3.7' and python_version < '3.9' +# gevent==21.12.0 ; sys_platform == 'win32' +gevent gunicorn ; python_version >= '3.6' supervisor ; sys_platform != 'win32' func_timeout diff --git "a/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md" "b/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md" index 2e7d8d948e04144510582a40ae6c15e1740650e4..ce832b86fe86ddeb9406c78c6f2e35113872a9ed 100644 --- "a/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md" +++ "b/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md" @@ -15,10 +15,10 @@ apt install python3 [蓝奏云下载](https://wwi.lanzoup.com/iDeIj0b27qob) ```shell # 运行容器-小白只需要这一条命令(存在问题是不能在远程面板上正确获取配置地址和进程管理地址,但自己知道地址就不影响使用,可进入容器自行修改config) -docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:mini +docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy # 稍微懂一点可以运行下面的操作 先把本项目拷贝到 /home/pywork/dr_py -docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy:mini +docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy # 进入容器然后修改config.py文件改配置里面自己的远程地址等信息,改完退出容器再重启容器(或者通过进程管理9001端口在线重启flask服务) docker exec -it drpy bash vi config.py