open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-27 14:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复entrypoint

Browse Source
This commit is contained in:
whyour 2021-05-01 23:23:47 +08:00
parent 05588e88ac
commit 65d13d5752
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-entrypoint.sh
View File

@ -13,14 +13,14 @@ echo
echo -e "======================3. 检测配置文件========================\n" echo -e "======================3. 检测配置文件========================\n"
fix_config fix_config
cp -fv ${QL_DIR}/docker/front.conf /etc/nginx/conf.d/front.conf cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf
echo -e "======================4. 启动nginx========================\n" echo -e "======================4. 启动nginx========================\n"
nginx -c /etc/nginx/nginx.conf nginx -c /etc/nginx/nginx.conf
echo echo
echo -e "======================5. 启动控制面板========================\n" echo -e "======================5. 启动控制面板========================\n"
pm2 start ${QL_DIR}/build/app.js -n panel pm2 start $dir_root/build/app.js -n panel
echo -e "控制面板启动成功...\n" echo -e "控制面板启动成功...\n"
echo -e "\n容器启动成功...\n" echo -e "\n容器启动成功...\n"

2
shell/share.sh
View File

@ -239,8 +239,6 @@ update_depend() {
npm_install_2 $dir_scripts npm_install_2 $dir_scripts
fi fi
[ ! -d $dir_scripts/node_modules ] && npm_install_2 $dir_scripts
if [ ! -s $dir_scripts/requirements.txt ] || [[ $(diff $dir_sample/requirements.txt $dir_scripts/requirements.txt) ]]; then if [ ! -s $dir_scripts/requirements.txt ] || [[ $(diff $dir_sample/requirements.txt $dir_scripts/requirements.txt) ]]; then
cp -f $dir_sample/requirements.txt $dir_scripts/requirements.txt cp -f $dir_sample/requirements.txt $dir_scripts/requirements.txt
cd $dir_scripts cd $dir_scripts