From 6664a24cc4961eff6cc6eb0e98ac36aa90f25b26 Mon Sep 17 00:00:00 2001 From: ngfchl Date: Thu, 8 Sep 2022 12:44:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0dockerfile=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=8Fdocker=E9=95=9C=E5=83=8F=E4=BD=93=E7=A7=AF=20?= =?UTF-8?q?2.=20=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91bug=E5=87=BA=E7=8E=B0=E5=87=A0?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 15 ++++++--------- requirements.txt | 33 ++++++++++++++++++++++++++++++++- tmp.jpg | Bin 3213 -> 0 bytes 3 files changed, 38 insertions(+), 10 deletions(-) delete mode 100644 tmp.jpg diff --git a/Dockerfile b/Dockerfile index 639e559..8853fa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,17 +37,14 @@ ADD ./start.sh /var/www/html # 给start.sh可执行权限 RUN chmod +x /var/www/html/start.sh -# 安装redis -RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list +# 更换USTC源,并安装gcc,git +RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && + apt update && + yes|apt install gcc git && + apt-get autoclean -#RUN apt update -#RUN yes|apt install libgl1-mesa-glx -#RUN yes|apt install redis-server - -#VOLUME ["/var/www/html/ptools/db"] VOLUME ["/var/www/html/ptools"] EXPOSE $DJANGO_WEB_PORT -#ENTRYPOINT ["redis-server","/etc/redis/redis.conf"] -#ENTRYPOINT ["/bin/bash", "first.sh"] + ENTRYPOINT ["/bin/bash", "/var/www/html/start.sh"] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f37ea73..cf9a263 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,19 @@ APScheduler==3.9.1 asgiref==3.5.2 async-timeout==4.0.2 +Babel==2.10.3 baidu-aip==4.16.7 +bce-python-sdk==0.8.74 +cachetools==5.2.0 certifi==2022.6.15 cffi==1.15.1 chardet==5.0.0 charset-normalizer==2.1.1 +click==8.1.3 cloudscraper==1.2.64 +cssselect==1.1.0 +cssutils==2.6.0 +cycler==0.11.0 defusedxml==0.7.1 Deprecated==1.2.13 diff-match-patch==20200713 @@ -17,29 +24,51 @@ django-redis==5.2.0 django-simpleui==2022.7.29 docker==6.0.0 et-xmlfile==1.1.0 +Flask==2.2.2 +Flask-Babel==2.0.0 +fonttools==4.37.1 +future==0.18.2 gitdb==4.0.9 GitPython==3.1.27 idna==3.3 +imageio==2.21.2 +importlib-metadata==4.12.0 +itsdangerous==2.1.2 +jarowinkler==1.2.1 +Jinja2==3.1.2 +kiwisolver==1.4.4 lxml==4.9.1 MarkupPy==1.14 +MarkupSafe==2.1.1 +matplotlib==3.5.3 +networkx==2.8.6 odfpy==1.4.1 OpenCC==1.1.4 -openpyxl==3.0.10 +opencv-python==4.6.0.66 packaging==21.3 +paddlepaddle==2.3.2 +pandas==1.4.4 +Pillow==9.2.0 +protobuf==4.21.5 pycparser==2.21 +pycryptodome==3.15.0 pyparsing==3.0.9 pypushdeer==0.0.3 +python-dateutil==2.8.2 pytz==2022.2.1 pytz-deprecation-shim==0.1.0.post0 +PyWavelets==1.3.0 PyYAML==6.0 qbittorrent-api==2022.8.37 redis==4.3.4 requests==2.28.1 requests-toolbelt==0.9.1 +scipy==1.9.1 six==1.16.0 smmap==5.0.0 sqlparse==0.4.2 tablib==3.2.1 +tifffile==2022.8.12 transmission-rpc==3.3.2 typing_extensions==4.3.0 tzdata==2022.2 @@ -47,7 +76,9 @@ tzlocal==4.2 urllib3==1.26.12 websocket-client==1.4.0 wechat-push==1.0.1 +Werkzeug==2.2.2 wrapt==1.14.1 wxpusher==2.2.0 xlrd==2.0.1 xlwt==1.3.0 +zipp==3.8.1 diff --git a/tmp.jpg b/tmp.jpg deleted file mode 100644 index 02d6bc140292dfa6ecb5157c38c07d3a85ca13d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3213 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