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