diff --git a/Dockerfile b/Dockerfile index c886e8a..9737b10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,9 +38,7 @@ 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 git; \ - apt-get autoclean && rm -rf /var/lib/apt/lists/* +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 VOLUME ["/var/www/html/ptools"] diff --git a/start.sh b/start.sh index 88435d5..502c1f1 100644 --- a/start.sh +++ b/start.sh @@ -1,24 +1,23 @@ #!/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 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; - + 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 # 创建超级用户 DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \ DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL \