diff --git a/app.sh b/app.sh index 5039b612b3300ba315fa555fd6414822b878ef47..c6e1a1f03a1edad3a3b9bb01c3d6a5e66376f815 100644 --- a/app.sh +++ b/app.sh @@ -1,5 +1,5 @@ #!/bin/bash -kill -9 $(cat supervisord.pid) # 杀掉进程 +#kill -9 $(cat supervisord.pid) # 杀掉进程 msg='flask或0 ubuntu下自动识别gevent或普通启动flask\nsflask或1 ubuntu下gunicorn启动flask\ntermux或2 termux下自动识别gevent或普通启动flask\nstermux或3 termux下gunicorn启动flask\n' case "$1" in flask) @@ -29,4 +29,6 @@ case "$1" in *) echo -e $msg ;; -esac \ No newline at end of file +esac +# 保留一个 bash +/bin/bash \ No newline at end of file diff --git a/dockerfile b/dockerfile index 9a269768c85d6c1f0e3a75dba198f2040f899df0..bb8dd9c0ffd59ac4d5a5ec291ac261242384e55c 100644 --- a/dockerfile +++ b/dockerfile @@ -24,15 +24,16 @@ RUN cp /etc/apt/sources.list /etc/apt/sources.list.bac # deb https://mirrors.bfsu.edu.cn/debian-security bullseye-security main contrib non-free # # deb-src https://mirrors.bfsu.edu.cn/debian-security bullseye-security main contrib non-free # EOF +RUN mkdir -p /etc/autostart ADD sources.list /etc/apt/ +ADD app.sh /etc/autostart/ # RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list -RUN apt-get clean -RUN apt-get update && apt-get install -y vim -# 执行指令,换源并安装依赖 -RUN pip install -i https://mirrors.cloud.tencent.com/pypi/simple --upgrade pip -# 设置默认pip源 -RUN pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple +RUN chmod +x /etc/autostart/app.sh && apt-get clean && apt-get update && apt-get install -y vim +# 执行指令,换源并安装依赖 设置默认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 + # 执行指令,安装依赖 RUN pip install -r requirements.txt # 切换容器时区 @@ -41,7 +42,11 @@ RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 EXPOSE 5705 9001 - +# docker build -f dockerfile -t hjdhnx/drpy:mini . 构建命令,非此文件内命令 +# docker build -f dockerfile -t 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 +# 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 # ENV LC_ALL=zh_CN.utf8 # ENV LANG=zh_CN.utf8 # ENV LANGUAGE=zh_CN.utf8 @@ -51,4 +56,9 @@ EXPOSE 5705 9001 # supervisord -c /root/sd/pywork/dr_py/super/flask.conf # CMD [ "supervisord","-c", "/root/sd/pywork/dr_py/super/flask.conf" ] # ENTRYPOINT supervisord -c /root/sd/pywork/dr_py/super/flask.conf -CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash +# ENTRYPOINT -c /root/sd/pywork/dr_py/super/flask.conf +# CMD /bin/bash +# 启动容器时,执行脚本 +ENTRYPOINT ["/etc/autostart/app.sh","flask"] +# CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash + 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 734529e85e65190a14c9cdba63856e4a1cfae823..6232fb1ad19dc436fd706e325e33061e30ab35a4 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" @@ -130,7 +130,7 @@ locale -a # build镜像 # docker buildx build --platform linux/amd64,linux/arm64 --push -f dockerfile -t hjdhnx/drpy:mini_arm64 . -# docker buildx build --platform linux/amd64,linux/arm64 -f dockerfile -t hjdhnx/drpy:mini_arm64 . +# docker buildx build --platform linux/amd64,linux/arm64,linux/armv7 -f dockerfile -t hjdhnx/drpy:mini_arm64 . # arch 看架构 ```