From 34d1e7b20139dce349615279bdd4e4e6329f4a64 Mon Sep 17 00:00:00 2001 From: Akira Date: Tue, 17 Nov 2020 10:59:34 +0800 Subject: [PATCH 1/4] Update Dockerfile --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 47d9920..5615cde 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"] From 455af5e2e7d04a83f12307542c3f82303e677e67 Mon Sep 17 00:00:00 2001 From: Akira Date: Tue, 17 Nov 2020 11:02:18 +0800 Subject: [PATCH 2/4] Update crontab_list.sh --- docker/crontab_list.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh index 3b2a449..8b18f28 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 # 京东排行榜 From 48783c7c6c92c93b892a25634089e4d4bc7d3b38 Mon Sep 17 00:00:00 2001 From: Akira Date: Tue, 17 Nov 2020 11:02:51 +0800 Subject: [PATCH 3/4] Update crontab_list_ts.sh --- docker/crontab_list_ts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/crontab_list_ts.sh b/docker/crontab_list_ts.sh index 7ffb506..a3fcad6 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 From 3ebc6efc0e0c0951349ccfa7d1098f07dde7a0be Mon Sep 17 00:00:00 2001 From: Akira Date: Tue, 17 Nov 2020 11:03:39 +0800 Subject: [PATCH 4/4] Update crontab_list_ts.sh --- docker/crontab_list_ts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/crontab_list_ts.sh b/docker/crontab_list_ts.sh index a3fcad6..3f14ea7 100644 --- a/docker/crontab_list_ts.sh +++ b/docker/crontab_list_ts.sh @@ -45,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 # 京东排行榜