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

修复entrypoint步骤

Browse Source
This commit is contained in:
hanhh 2021-07-01 18:52:50 +08:00
parent 7ecd38ad1f
commit a14a8cc067
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/Dockerfile
View File

@ -29,14 +29,11 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
&& echo "Asia/Shanghai" > /etc/timezone \ && echo "Asia/Shanghai" > /etc/timezone \
&& touch ~/.bashrc \ && touch ~/.bashrc \
&& mkdir /run/nginx \ && mkdir /run/nginx \
&& git clone -b ${QL_BRANCH} https://github.com/whyour/qinglong-static.git /static \
&& git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
&& git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.email "qinglong@@users.noreply.github.com" \
&& git config --global user.name "qinglong" \ && git config --global user.name "qinglong" \
&& git config --global pull.rebase true \ && git config --global pull.rebase true \
&& cd ${QL_DIR} \ && cd ${QL_DIR} \
&& cp -rf /static/* ./ \
&& rm -rf /static \
&& cp -f .env.example .env \ && cp -f .env.example .env \
&& chmod 777 ${QL_DIR}/shell/*.sh \ && chmod 777 ${QL_DIR}/shell/*.sh \
&& chmod 777 ${QL_DIR}/docker/*.sh \ && chmod 777 ${QL_DIR}/docker/*.sh \
@ -44,5 +41,8 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
&& npm install -g pnpm \ && npm install -g pnpm \
&& rm -rf /root/.npm \ && rm -rf /root/.npm \
&& pnpm install --prod \ && pnpm install --prod \
&& rm -rf /root/.pnpm-store && rm -rf /root/.pnpm-store \
&& git clone -b ${QL_BRANCH} https://github.com/whyour/qinglong-static.git /static \
&& cp -rf /static/* ${QL_DIR} \
&& rm -rf /static
ENTRYPOINT ["./docker/docker-entrypoint.sh"] ENTRYPOINT ["./docker/docker-entrypoint.sh"]

14
docker/docker-entrypoint.sh
View File

@ -10,11 +10,15 @@ cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf
pm2 l >/dev/null 2>&1 pm2 l >/dev/null 2>&1
echo echo
echo -e "======================2. 启动nginx========================\n" echo -e "======================2. 安装依赖========================\n"
update_depend
echo
echo -e "======================3. 启动nginx========================\n"
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
echo -e "nginx启动成功...\n" echo -e "nginx启动成功...\n"
echo -e "======================3. 启动控制面板========================\n" echo -e "======================4. 启动控制面板========================\n"
if [[ $(pm2 info panel 2>/dev/null) ]]; then if [[ $(pm2 info panel 2>/dev/null) ]]; then
pm2 reload panel --source-map-support --time pm2 reload panel --source-map-support --time
else else
@ -22,7 +26,7 @@ else
fi fi
echo -e "控制面板启动成功...\n" echo -e "控制面板启动成功...\n"
echo -e "======================4. 启动定时任务========================\n" echo -e "======================5. 启动定时任务========================\n"
if [[ $(pm2 info schedule 2>/dev/null) ]]; then if [[ $(pm2 info schedule 2>/dev/null) ]]; then
pm2 reload schedule --source-map-support --time pm2 reload schedule --source-map-support --time
else else
@ -31,12 +35,12 @@ fi
echo -e "定时任务启动成功...\n" echo -e "定时任务启动成功...\n"
if [[ $AutoStartBot == true ]]; then if [[ $AutoStartBot == true ]]; then
echo -e "======================5. 启动bot========================\n" echo -e "======================6. 启动bot========================\n"
ql bot ql bot
fi fi
if [[ $EnableExtraShell == true ]]; then if [[ $EnableExtraShell == true ]]; then
echo -e "======================6. 执行自定义脚本========================\n" echo -e "======================7. 执行自定义脚本========================\n"
ql extra ql extra
fi fi