From cb5ba2e4388ae81d2efb427178e0e039f9093c6e Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 10:47:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 4 ++--
 start.sh   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a3b65cf..4c26954 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,13 +25,13 @@ WORKDIR /var/www/html/
 #ADD . /var/www/html/ptools
 ADD ./start.sh /var/www/html/
 # 更新pip版本
-RUN /usr/local/bin/python -m pip install --upgrade pip
+#RUN /usr/local/bin/python -m pip install --upgrade pip
 
 # 利用 pip 安装依赖
 #RUN pip install -r requirements.txt
 
 # 去除windows系统编辑文件中多余的\r回车空格
- RUN sed -i 's/\r//' ./start.sh
+# RUN sed -i 's/\r//' ./start.sh
 
 # 给start.sh可执行权限
 RUN chmod +x ./start.sh
diff --git a/start.sh b/start.sh
index 7a618fd..fe9e96e 100644
--- a/start.sh
+++ b/start.sh
@@ -17,7 +17,8 @@ if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
     git pull
   git checkout master &&
     git branch --set-upstream-to=origin/master master
-  pip install -r requirements.txt &&
+  python -m pip install --upgrade pip &&
+    pip install -r requirements.txt &&
     python manage.py makemigrations &&
     python manage.py migrate &&
     python manage.py loaddata pt.json