diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 723f0f4c..39f110da 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -13,14 +13,14 @@ echo echo -e "======================3. 检测配置文件========================\n" 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" nginx -c /etc/nginx/nginx.conf echo 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容器启动成功...\n" diff --git a/shell/share.sh b/shell/share.sh index e4ee18a3..b52447c4 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -239,8 +239,6 @@ update_depend() { npm_install_2 $dir_scripts 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 cp -f $dir_sample/requirements.txt $dir_scripts/requirements.txt cd $dir_scripts