nas/ptools
1
0
Fork 0
mirror of https://github.com/ngfchl/ptools synced 2023-07-10 13:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新docker镜像，优化启动脚本，将日志以启动日期为名写在数据库文件夹中

Browse Source
This commit is contained in:
ngfchl
2022-10-05 16:37:38 +08:00
parent a40a7b5cd1
commit e08fd361fa
2 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -47,4 +47,4 @@ VOLUME ["/var/www/html/ptools/db"]
EXPOSE $DJANGO_WEB_PORT
ENTRYPOINT ["/bin/bash", "/var/www/html/start.sh", "start"]
ENTRYPOINT ["/bin/bash", "/var/www/html/start.sh"]

70
start.sh
View File

@@ -1,44 +1,38 @@
#!/bin/bash
# 升级pip到最新
python -m pip install --upgrade pip &&
# 写入U2的HOSTS
echo 172.64.153.252 u2.dmhy.org >>/etc/hosts &&
CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
echo "-- First container startup --"
# 此处插入你要执行的命令或者脚本文件
git init &&
git remote add origin https://gitee.com/ngfchl/ptools &&
# 设置拉取最新文件并覆盖
git config pull.ff only &&
git pull origin $DEV &&
ls -l && pwd &&
cp /var/www/html/ptools/start.sh /var/www/html/start.sh
# 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 \
DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD \
python manage.py createsuperuser --noinput
else
echo "-- Not first container startup --"
fi
echo $DEV
CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
if [[ $DEV == dev ]]; then
echo "您当前处于开发版本，请注意备份文件"
else
echo "您当前处于稳定版本"
fi
pip install -r requirements.txt &&
python manage.py makemigrations &&
python manage.py migrate &&
python manage.py runserver 0.0.0.0:$DJANGO_WEB_PORT
if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
echo "-- First container startup --"
echo "升级pip"
python -m pip install --upgrade pip
# 此处插入你要执行的命令或者脚本文件
echo "下载PTools代码"
git init &&
git remote add origin https://gitee.com/ngfchl/ptools &&
# 设置拉取最新文件并覆盖
git config pull.ff only &&
git pull origin $DEV
echo "列出代码文件信息"
ls -l && pwd
echo "安装pip依赖"
pip install -r requirements.txt -U
echo "初始化数据库"
python manage.py makemigrations
python manage.py migrate
python manage.py loaddata pt.json
echo "创建超级用户"
DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME \
DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL \
DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD \
python manage.py createsuperuser --noinput
echo "初始化完成"
touch $CONTAINER_ALREADY_STARTED
else
echo "-- Not first container startup --"
fi
echo "启动服务"
python manage.py runserver 0.0.0.0:$DJANGO_WEB_PORT >>/var/www/html/ptools/db/$(date "+%Y%m%d").log 2>&1