diff --git a/docker/Dockerfile b/docker/Dockerfile index 47d99203..5615cde9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ RUN git clone https://github.com/lxk0301/jd_scripts /scripts \ && cd /scripts \ && mkdir logs \ && npm install \ - && cd ~ \ + && cd /tmp \ && npm install request ENV CRONTAB_LIST_FILE crontab_list_ts.sh @@ -20,4 +20,4 @@ RUN crontab /scripts/docker/crontab_list_ts.sh WORKDIR /scripts -CMD ["node"] \ No newline at end of file +CMD ["node"] diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh index 3b2a449c..8b18f28e 100644 --- a/docker/crontab_list.sh +++ b/docker/crontab_list.sh @@ -1,6 +1,7 @@ 0 */1 * * * git -C /scripts/ pull >> /scripts/logs/pull.log 2>&1 2 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE} 3 */1 * * * npm install --prefix /scripts >> /scripts/logs/npm_install.log 2>&1 +4 */1 * * * npm install request --prefix /tmp >> /scripts/logs/npm_install_request.log 2>&1 # 每3天的23:50分清理一次日志 50 23 */3 * * rm -rf /scripts/logs/*.log @@ -44,7 +45,7 @@ # 取关京东店铺商品 55 23 * * * node /scripts/jd_unsubscribe.js >> /scripts/logs/jd_unsubscribe.log 2>&1 # 京豆变动通知 -0 2 * * * node /scripts/jd_bean_change.js >> /scripts/logs/jd_bean_change.log 2>&1 +0 10 * * * node /scripts/jd_bean_change.js >> /scripts/logs/jd_bean_change.log 2>&1 # 京东抽奖机 11 1 * * * node /scripts/jd_lotteryMachine.js >> /scripts/logs/jd_lotteryMachine.log 2>&1 # 京东排行榜 diff --git a/docker/crontab_list_ts.sh b/docker/crontab_list_ts.sh index 7ffb506d..3f14ea7d 100644 --- a/docker/crontab_list_ts.sh +++ b/docker/crontab_list_ts.sh @@ -1,6 +1,7 @@ 0 */1 * * * git -C /scripts/ pull |ts >> /scripts/logs/pull.log 2>&1 2 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE} 3 */1 * * * npm install --prefix /scripts |ts >> /scripts/logs/npm_install.log 2>&1 +4 */1 * * * npm install request --prefix /tmp |ts >> /scripts/logs/npm_install_request.log 2>&1 # 每3天的23:50分清理一次日志 50 23 */3 * * rm -rf /scripts/logs/*.log @@ -44,7 +45,7 @@ # 取关京东店铺商品 55 23 * * * node /scripts/jd_unsubscribe.js |ts >> /scripts/logs/jd_unsubscribe.log 2>&1 # 京豆变动通知 -0 2 * * * node /scripts/jd_bean_change.js |ts >> /scripts/logs/jd_bean_change.log 2>&1 +0 10 * * * node /scripts/jd_bean_change.js |ts >> /scripts/logs/jd_bean_change.log 2>&1 # 京东抽奖机 11 1 * * * node /scripts/jd_lotteryMachine.js |ts >> /scripts/logs/jd_lotteryMachine.log 2>&1 # 京东排行榜