Merge remote-tracking branch 'origin/master' into master

docker_env/django/Dockerfile

@@ -10,7 +10,7 @@ RUN apt-get install -y redis-tools
 RUN mkdir /dvadmin-backend
 WORKDIR /dvadmin-backend
 COPY ./dvadmin-backend/requirements.txt /
-COPY ./dvadmin-backend/conf/env.example.py ./dvadmin-backend/conf/env.py
+COPY ./dvadmin-backend/conf/env.example.py /dvadmin-backend/conf/env.py
 RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements.txt
 CMD ["/dvadmin-backend/docker_start.sh"]
 # ENTRYPOINT [ "uwsgi --ini /backend/azcrm/uwsgi.ini" ]

dvadmin-backend/docker_start.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 cd /dvadmin-backend
-
+cp -rf ./conf/env.example.py ./conf/env.py
+python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ uwsgi==2.0.19.1
 python ./manage.py makemigrations
 python ./manage.py migrate
 #python ./manage.py initialization

dvadmin-backend/requirements.txt

@@ -21,4 +21,3 @@ six==1.15.0
 sqlparse==0.4.1
 xlwt==1.3.0
 coreapi==2.3.3
-uwsgi==2.0.19.1