From 4a5737376a4e97499cd3103c0f04ca8662fd7a5d Mon Sep 17 00:00:00 2001 From: Akira Date: Fri, 11 Dec 2020 18:39:57 +0800 Subject: [PATCH 1/3] fix --- docker/default_task.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/default_task.sh b/docker/default_task.sh index 93050d47..8be1adce 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -32,7 +32,7 @@ if type jq >/dev/null 2>&1; then else # 第一版通知逻辑无法包含在上面判断里面，镜像构建好直接开启通知 echo "当前容版版本过旧，发送镜像更新通知" - export NOTIFY_CONTEXT="更新内容较多，重新阅读仓库Readme()，更新镜像并更新配置后使用。" + export NOTIFY_CONTENT="更新内容较多，重新阅读仓库Readme()，更新镜像并更新配置后使用。" cd /scripts/docker node notify_docker_user.js fi From 899e193e8f7a2480fedd00e4fcfe857788e7b0e2 Mon Sep 17 00:00:00 2001 From: Akira Date: Fri, 11 Dec 2020 18:40:38 +0800 Subject: [PATCH 2/3] fix --- docker/crontab_list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/crontab_list.sh b/docker/crontab_list.sh index 61e22644..eeb0fb49 100644 --- a/docker/crontab_list.sh +++ b/docker/crontab_list.sh @@ -1,5 +1,5 @@ #必须要的默认定时任务请勿删除 -52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1 +52 */1 * * * sh /scripts/docker/default_task.sh >> /scripts/logs/default_task.log 2>&1 # 每3天的23:50分清理一次日志 50 23 */3 * * rm -rf /scripts/logs/*.log @@ -84,4 +84,4 @@ # 领京豆额外奖励(每日可获得3京豆) 33 4 * * * node /scripts/jd_bean_home.js >> /scripts/logs/jd_bean_home.log 2>&1 # 京东直播(每日18豆) -10-20/5 11 * * * node /scripts/jd_live.js >> /scripts/logs/jd_live.log 2>&1 \ No newline at end of file +10-20/5 11 * * * node /scripts/jd_live.js >> /scripts/logs/jd_live.log 2>&1 From ba6b6db23484387dee67b367d12a05f2970ddf73 Mon Sep 17 00:00:00 2001 From: iouAkira Date: Fri, 11 Dec 2020 18:50:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=20=E5=A2=9E=E5=8A=A0=20readme=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/default_task.sh | 2 +- docker/docker_entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/default_task.sh b/docker/default_task.sh index 8be1adce..0ba1dafd 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -32,7 +32,7 @@ if type jq >/dev/null 2>&1; then else # 第一版通知逻辑无法包含在上面判断里面，镜像构建好直接开启通知 echo "当前容版版本过旧，发送镜像更新通知" - export NOTIFY_CONTENT="更新内容较多，重新阅读仓库Readme()，更新镜像并更新配置后使用。" + export NOTIFY_CONTENT="更新内容较多，重新阅读仓库Readme(https://github.com/lxk0301/jd_scripts/tree/master/docker)，更新镜像并更新配置后使用。" cd /scripts/docker node notify_docker_user.js fi diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh index 38e9900c..53c6c872 100644 --- a/docker/docker_entrypoint.sh +++ b/docker/docker_entrypoint.sh @@ -46,7 +46,7 @@ else # 第一版通知逻辑无法包含在上面判断里面，镜像构建好直接开启通知 echo "Current container version is too old, send update notification" echo "当前版本过旧，发送镜像更新通知" - export NOTIFY_CONTEXT="更新内容较多，重新阅读仓库Readme()，更新镜像并更新配置后使用。" + export NOTIFY_CONTENT="更新内容较多，重新阅读仓库Readme(https://github.com/lxk0301/jd_scripts/tree/master/docker)，更新镜像并更新配置后使用。" cd /scripts/docker node notify_docker_user.js fi