From 1de8af6664afd7ec3b9b06786bdaf7f822abfd37 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Mon, 19 Sep 2022 19:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=99=A8=E5=AF=BC=E8=87=B4=E5=9C=A8=E6=9C=AA=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Cmakemigrations=E5=92=8Cmigrate=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile |  4 +++-
 start.sh   | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9737b10..c886e8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,9 @@ ADD ./start.sh /var/www/html
 RUN chmod +x /var/www/html/start.sh
 
 # 更换USTC源，并安装gcc，git
-RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && apt update && yes|apt install gcc git &&     apt-get autoclean
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list; \
+    apt update && yes|apt install git; \
+    apt-get autoclean && rm -rf /var/lib/apt/lists/*
 
 VOLUME ["/var/www/html/ptools"]
 
diff --git a/start.sh b/start.sh
index 502c1f1..88435d5 100644
--- a/start.sh
+++ b/start.sh
@@ -1,23 +1,24 @@
 #!/bin/bash
 # 升级pip到最新
-python -m pip install --upgrade pip
-CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
+python -m pip install --upgrade pip &&
+  CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
 if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
   echo "-- First container startup --"
-  touch $CONTAINER_ALREADY_STARTED
   # 此处插入你要执行的命令或者脚本文件
   git config --global init.defaultBranch master &&
     git init &&
     git remote add origin https://gitee.com/ngfchl/ptools &&
     # 设置拉取最新文件并覆盖
     git config pull.ff only &&
-    git pull
-  git checkout master &&
-    git branch --set-upstream-to=origin/master master
-  pip install -r requirements.txt &&
-    python manage.py makemigrations &&
-    python manage.py migrate &&
-    python manage.py loaddata pt.json
+    git pull origin master
+  ls -l && pwd; \
+    #    git branch --set-upstream-to=origin/master master &&
+    pip install -r requirements.txt; \
+    python manage.py makemigrations \
+    python manage.py migrate; \
+    python manage.py loaddata pt.json; \
+    touch $CONTAINER_ALREADY_STARTED;
+
   # 创建超级用户
   DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \
     DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL \