From d24e018a068ae34548156dc88127d0f226a119c0 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 10:06:12 +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 |  5 ++---
 start.sh   | 32 ++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cac30e3..0ea877b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,8 @@ RUN mkdir -p /var/www/html/ptools
 WORKDIR /var/www/html/ptools
 
 # 将当前目录加入到工作目录中（. 表示当前目录）
-ADD . /var/www/html/ptools
-# git pull最新
-RUN git config pull.ff only
+#ADD . /var/www/html/ptools
+
 # 更新pip版本
 RUN /usr/local/bin/python -m pip install --upgrade pip
 
diff --git a/start.sh b/start.sh
index d3b4cd1..3177701 100644
--- a/start.sh
+++ b/start.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 pip install -r requirements.txt
+
 CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
-if [ ! -f ./db/db.sqlite3 ]; then
-  echo "-- 初始化数据库 init database --"
-  # 如果数据库存在，就不执行
-  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 --"
+  # 拉取文件
+  git clone https://gitee.com/ngfchl/ptools &&
+    #  进入文件夹
+    cd ptools &&
+    # 设置拉取最新文件并覆盖
+    git config pull.ff only &&
+    python manage.py makemigrations &&
+    python manage.py migrate &&
+    python manage.py loaddata pt.json
   # 此处插入你要执行的命令或者脚本文件
   # 创建超级用户
   DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \
@@ -21,8 +23,14 @@ if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
     python manage.py createsuperuser --noinput
 else
   echo "-- Not first container startup --"
+  if [ ! -f ./db/db.sqlite3 ]; then
+    echo "-- 初始化数据库 init database --"
+    # 如果数据库存在，就不执行
+    python manage.py makemigrations &&
+      python manage.py migrate &&
+      python manage.py loaddata pt.json
+  fi
+  python manage.py makemigrations &&
+    python manage.py migrate &&
+    python manage.py runserver $DJANGO_WEB_PORT --noreload
 fi
-
-python manage.py makemigrations &&
-  python manage.py migrate &&
-  python manage.py runserver $DJANGO_WEB_PORT --noreload