From 45a35b10b06a768844491e75bcabe4fa869d30f8 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 09:41:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5=E9=94=99=E8=AF=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=A1=E6=81=AF=202.=20=E7=BB=A7=E7=BB=AD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=9C=A8=E7=BA=BF=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=203.=20=E4=BC=98=E5=8C=96MT=E4=B8=AA=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile       |  3 +-
 requirements.txt | 77 ------------------------------------------------
 start.sh         |  2 +-
 3 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d20993..4f79f53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,8 @@ WORKDIR /var/www/html/ptools
 
 # 将当前目录加入到工作目录中（. 表示当前目录）
 ADD . /var/www/html/ptools
-
+# git pull最新
+RUN git config pull.ff only
 # 更新pip版本
 RUN /usr/local/bin/python -m pip install --upgrade pip
 
diff --git a/requirements.txt b/requirements.txt
index 350f5f7..31b7296 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,29 +1,11 @@
 APScheduler==3.9.1
 asgiref==3.5.2
-astor==0.8.1
 async-timeout==4.0.2
-attrdict==2.0.1
-attrs==21.4.0
-Automat==20.2.0
-Babel==2.10.3
 baidu-aip==4.16.7
-bce-python-sdk==0.8.74
-beautifulsoup4==4.11.1
-cachetools==5.2.0
 certifi==2022.6.15
-cffi==1.15.1
-cfscrape==2.1.1
 chardet==5.0.0
 charset-normalizer==2.1.1
-click==8.1.3
 cloudscraper==1.2.60
-constantly==15.1.0
-cryptography==37.0.4
-cssselect==1.1.0
-cssutils==2.5.1
-cycler==0.11.0
-Cython==0.29.32
-decorator==5.1.1
 defusedxml==0.7.1
 deluge-client==1.9.0
 Deprecated==1.2.13
@@ -34,94 +16,35 @@ django-import-export==2.8.0
 django-redis==5.2.0
 django-simpleui==2022.7.29
 et-xmlfile==1.1.0
-filelock==3.7.1
-Flask==2.2.2
-Flask-Babel==2.0.0
-fonttools==4.35.0
-future==0.18.2
-hyperlink==21.0.0
 idna==3.3
-imageio==2.21.1
-imgaug==0.4.0
 importlib-metadata==4.12.0
-incremental==21.3.0
-itemadapter==0.6.0
-itemloaders==1.0.4
-itsdangerous==2.1.2
-Jinja2==3.1.2
-jmespath==1.0.1
-kiwisolver==1.4.4
-lmdb==1.3.0
 lxml==4.9.1
 Markdown==3.4.1
 MarkupPy==1.14
-MarkupSafe==2.1.1
-matplotlib==3.5.3
-mysqlclient==2.1.1
-networkx==2.8.5
-numpy==1.23.2
 odfpy==1.4.1
 OpenCC==1.1.4
-opencv-contrib-python==4.4.0.46
-opencv-python==4.6.0.66
 openpyxl==3.0.10
-opt-einsum==3.3.0
 packaging==21.3
-paddle-bfloat==0.1.7
-paddleocr==2.5.0.3
-paddlepaddle==2.3.1
-pandas==1.4.3
-parsel==1.6.0
-Pillow==9.2.0
-premailer==3.10.0
-Protego==0.2.1
-protobuf==3.20.0
-pyasn1==0.4.8
-pyasn1-modules==0.2.8
-pyclipper==1.3.0.post3
-pycparser==2.21
-pycryptodome==3.15.0
-PyDispatcher==2.0.5
-pyOpenSSL==22.0.0
 pyparsing==3.0.9
 pypushdeer==0.0.3
-python-dateutil==2.8.2
-python-Levenshtein==0.12.2
 pytz==2022.2.1
 pytz-deprecation-shim==0.1.0.post0
-PyWavelets==1.3.0
 PyYAML==6.0
 qbittorrent-api==2022.8.36
-queuelib==1.6.2
 redis==4.3.4
 requests==2.28.1
-requests-file==1.5.1
 requests-toolbelt==0.9.1
-scikit-image==0.19.3
-scipy==1.9.0
-Scrapy==2.6.2
-service-identity==21.1.0
-Shapely==1.8.3
 six==1.16.0
-soupsieve==2.3.2.post1
 sqlparse==0.4.2
 tablib==3.2.1
-tifffile==2022.8.12
-tldextract==3.3.1
-tqdm==4.64.0
 transmission-rpc==3.3.2
-Twisted==22.4.0
 typing_extensions==4.3.0
 tzdata==2022.2
 tzlocal==4.2
 urllib3==1.26.11
-visualdl==2.3.0
-w3lib==1.22.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
-zope.interface==5.4.0
diff --git a/start.sh b/start.sh
index 9167cc6..3f4277e 100644
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-git pull https://ngfchl:.wq891222@gitee.com/ngfchl/pt_assister
 pip install -r requirements.txt
 CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
 if [ ! -f ./db/db.sqlite3 ]; then
@@ -25,5 +24,6 @@ else
   echo "-- Not first container startup --"
 fi
 
+python manage.py makemigrations &&
 python manage.py migrate &&
   python manage.py runserver 0.0.0.0:8000 --noreload