diff --git a/docker/Dockerfile b/docker/Dockerfile index 599379c2..3437cb75 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM node:lts-alpine LABEL maintainer="whyour" ARG QL_URL=https://github.com/whyour/qinglong.git -ARG QL_BRANCH=master +ARG QL_BRANCH=develop ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ LANG=zh_CN.UTF-8 \ SHELL=/bin/bash \ diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index f448e0cb..99631094 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -46,6 +46,6 @@ echo -e "容器启动成功..." echo -e "\n请先访问5700端口,登录成功面板之后再执行添加定时任务..." echo -e "############################################################\n" -crond -f +crond -f >/dev/null exec "$@"