From 8177d46a4bf0dd9c225888993e54f5db4cc7e90a Mon Sep 17 00:00:00 2001 From: Akira Date: Mon, 18 Jan 2021 14:25:22 +0800 Subject: [PATCH 1/3] Update default_task.sh --- docker/default_task.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/default_task.sh b/docker/default_task.sh index 8ccd94b3..ae87a981 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -36,14 +36,16 @@ else fi echo "第3步判断是否配置了默认脚本更新任务..." -if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then +if [ $(grep -c "docker_entrypoint.sh" $mergedListFile) -eq '0' ]; then echo "合并后的定时任务文件，未包含必须的默认定时任务，增加默认定时任务..." echo -e >>$mergedListFile echo "52 */1 * * * docker_entrypoint.sh >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile -else +elif [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ] sed -i "/default_task.sh/d" $mergedListFile echo "#脚本追加默认定时任务" >>$mergedListFile echo "52 */1 * * * docker_entrypoint.sh >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile +else + echo "已配置默认脚本更新任务。" fi echo "第5步判断是否配置了随即延迟参数..." From 648e6345a90b480f31ba614695ade4ce99ef6d8b Mon Sep 17 00:00:00 2001 From: Akira Date: Mon, 18 Jan 2021 14:35:06 +0800 Subject: [PATCH 2/3] Update default_task.sh --- docker/default_task.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docker/default_task.sh b/docker/default_task.sh index ae87a981..63df090e 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -11,7 +11,7 @@ fi mergedListFile="/scripts/docker/merged_list_file.sh" echo "合并后定时任务文件路径为 ${mergedListFile}" -echo "第3步将默认定时任务列表添加到并后定时任务文件..." +echo "第1步将默认定时任务列表添加到并后定时任务文件..." cat $defaultListFile >$mergedListFile echo "第2步判断是否存在自定义任务任务列表并追加..." @@ -35,20 +35,19 @@ else echo "当前只使用了默认定时任务文件 $DEFAULT_LIST_FILE ..." fi +##可能存在旧版crontab里面有default_task.sh任务有就直接删除，否则可能会任务重复 +sed -i "/default_task.sh/d" $mergedListFile + echo "第3步判断是否配置了默认脚本更新任务..." if [ $(grep -c "docker_entrypoint.sh" $mergedListFile) -eq '0' ]; then echo "合并后的定时任务文件，未包含必须的默认定时任务，增加默认定时任务..." echo -e >>$mergedListFile echo "52 */1 * * * docker_entrypoint.sh >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile -elif [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ] - sed -i "/default_task.sh/d" $mergedListFile - echo "#脚本追加默认定时任务" >>$mergedListFile - echo "52 */1 * * * docker_entrypoint.sh >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile else echo "已配置默认脚本更新任务。" fi -echo "第5步判断是否配置了随即延迟参数..." +echo "第4步判断是否配置了随即延迟参数..." if [ $RANDOM_DELAY_MAX ]; then if [ $RANDOM_DELAY_MAX -ge 1 ]; then echo "已设置随机延迟为 $RANDOM_DELAY_MAX , 设置延迟任务中..." @@ -58,7 +57,7 @@ else echo "未配置随即延迟对应的环境变量，故不设置延迟任务..." fi -echo "第6步判断是否配置自定义shell执行脚本..." +echo "第5步判断是否配置自定义shell执行脚本..." if [ 0"$CUSTOM_SHELL_FILE" = "0" ]; then echo "未配置自定shell脚本文件，跳过执行。" else @@ -81,14 +80,14 @@ else fi fi -echo "第7步增加 |ts 任务日志输出时间戳..." +echo "第6步增加 |ts 任务日志输出时间戳..." sed -i "/\( ts\| |ts\|| ts\)/!s/>>/\|ts >>/g" $mergedListFile -echo "第8步执行proc_file.sh脚本任务..." +echo "第7步执行proc_file.sh脚本任务..." sh -x /scripts/docker/proc_file.sh -echo "第9步加载最新的定时任务文件..." +echo "第8步加载最新的定时任务文件..." crontab $mergedListFile -echo "第10步将仓库的docker_entrypoint.sh脚本更新至系统/usr/local/bin/docker_entrypoint.sh内..." +echo "第9步将仓库的docker_entrypoint.sh脚本更新至系统/usr/local/bin/docker_entrypoint.sh内..." cat /scripts/docker/docker_entrypoint.sh >/usr/local/bin/docker_entrypoint.sh From ab37a94ee84ee3d185cd51d9cc1dd65940c17993 Mon Sep 17 00:00:00 2001 From: Akira Date: Mon, 18 Jan 2021 14:48:12 +0800 Subject: [PATCH 3/3] Update Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加一个 `lxk0301/jd_scripts` 镜像的 `pull` 状态 --- docker/Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Readme.md b/docker/Readme.md index f46bccfc..48437d02 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -1,3 +1,4 @@ +![Docker Pulls](https://img.shields.io/docker/pulls/lxk0301/jd_scripts?style=for-the-badge) ### Usage ```diff + 2021-01-03更新 增加 CUSTOM_SHELL_FILE 参数配置执行自定义shell脚本