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 02d6bc1..0000000 Binary files a/tmp.jpg and /dev/null differ