From 9f189b8e9ef52981466912d1e9b9dda2d0bf60ca Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 09:49:27 +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 |  1 +
 start.sh   | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f79f53..cac30e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV PYTHONUNBUFFERED 1
 ENV DJANGO_SUPERUSER_USERNAME=admin
 ENV DJANGO_SUPERUSER_EMAIL=admin@eamil.com
 ENV DJANGO_SUPERUSER_PASSWORD=adminadmin
+ENV DJANGO_WEB_PORT=8000
 
 COPY pip.conf /root/.pip/pip.conf
 
diff --git a/start.sh b/start.sh
index 3f4277e..d3b4cd1 100644
--- a/start.sh
+++ b/start.sh
@@ -5,16 +5,15 @@ CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
 if [ ! -f ./db/db.sqlite3 ]; then
   echo "-- 初始化数据库 init database --"
   # 如果数据库存在，就不执行
-  mv db.sqlite3 ./db/db.sqlite3
+  python manage.py makemigrations &&
+    python manage.py migrate &&
+    python manage.py loaddata pt.json
+#  mv db.sqlite3 ./db/db.sqlite3
 fi
 if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
   touch $CONTAINER_ALREADY_STARTED
   echo "-- First container startup --"
   # 此处插入你要执行的命令或者脚本文件
-  # 安装依赖
-  #  mv db.sqlite3 ./db/sqlite3 &&
-  # 导入数据 person.json为自定义
-  #  python manage.py loaddata person.json &&
   # 创建超级用户
   DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \
     DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL \
@@ -25,5 +24,5 @@ else
 fi
 
 python manage.py makemigrations &&
-python manage.py migrate &&
-  python manage.py runserver 0.0.0.0:8000 --noreload
+  python manage.py migrate &&
+  python manage.py runserver $DJANGO_WEB_PORT --noreload