From 605655f2b902d2a2f4816293a62a35baad991487 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 11:05:33 +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 | 11 ++++++-----
 start.sh   | 31 +++++++++----------------------
 update.sh  |  2 +-
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4c26954..a377d4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,14 +16,15 @@ ENV DJANGO_WEB_PORT=8000
 COPY pip.conf /root/.pip/pip.conf
 
 # 创建 myproject 文件夹
-RUN mkdir -p /var/www/html/
+RUN mkdir -p /var/www/html/ptools
 
 # 将 myproject 文件夹为工作目录
-WORKDIR /var/www/html/
+WORKDIR /var/www/html/ptools
 
 # 将当前目录加入到工作目录中（. 表示当前目录）
 #ADD . /var/www/html/ptools
-ADD ./start.sh /var/www/html/
+ADD ./start.sh /var/www/html
+
 # 更新pip版本
 #RUN /usr/local/bin/python -m pip install --upgrade pip
 
@@ -34,7 +35,7 @@ ADD ./start.sh /var/www/html/
 # RUN sed -i 's/\r//' ./start.sh
 
 # 给start.sh可执行权限
-RUN chmod +x ./start.sh
+RUN chmod +x /var/www/html/start.sh
 
 # 安装redis
 RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
@@ -49,4 +50,4 @@ VOLUME ["/var/www/html/ptools"]
 EXPOSE  8000
 #ENTRYPOINT ["redis-server","/etc/redis/redis.conf"]
 #ENTRYPOINT ["/bin/bash", "first.sh"]
-ENTRYPOINT ["/bin/bash", "start.sh"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "/var/www/html/start.sh"]
\ No newline at end of file
diff --git a/start.sh b/start.sh
index fe9e96e..77f0faf 100644
--- a/start.sh
+++ b/start.sh
@@ -3,13 +3,9 @@
 CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
 if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
   echo "-- First container startup --"
-  # 拉取文件
-  if [ ! -f ptools ]; then
-
-    git clone https://gitee.com/ngfchl/ptools
-  fi
-  #  进入文件夹
-  cd ptools &&
+  touch $CONTAINER_ALREADY_STARTED
+  # 此处插入你要执行的命令或者脚本文件
+  git config --global init.defaultBranch master &&
     git init &&
     git remote add origin https://gitee.com/ngfchl/ptools &&
     # 设置拉取最新文件并覆盖
@@ -22,25 +18,16 @@ if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
     python manage.py makemigrations &&
     python manage.py migrate &&
     python manage.py loaddata pt.json
-  # 此处插入你要执行的命令或者脚本文件
   # 创建超级用户
   DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \
     DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL \
     DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD \
-    python manage.py createsuperuser --noinput &&
-    touch $CONTAINER_ALREADY_STARTED
+    python manage.py createsuperuser --noinput
 else
   echo "-- Not first container startup --"
-  cd ptools &&
-    pip install -r requirements.txt
-  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
+pip install -r requirements.txt &&
+  python manage.py makemigrations &&
+  python manage.py migrate &&
+  python manage.py runserver $DJANGO_WEB_PORT --noreload
diff --git a/update.sh b/update.sh
index b58a57b..a7f8eee 100755
--- a/update.sh
+++ b/update.sh
@@ -1,4 +1,4 @@
 git pull &&
-  mv -f ./start.sh ../start.sh &&
+  mv -f /var/www/html/ptools/start.sh /var/www/html/start.sh &&
   python manage.py makemigrations &&
   python manage.py migrate