From 884789b8983eaa3046ab94d60020624fb7bd2e44 Mon Sep 17 00:00:00 2001
From: AboutCXJ <AboutCXJ@gmail.com>
Date: Thu, 21 Jan 2021 10:17:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=90=E8=A1=8C=E6=9F=90=E4=BA=9B=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/default_task.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docker/default_task.sh b/docker/default_task.sh
index 63df090e..589700bd 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -80,14 +80,28 @@ else
     fi
 fi
 
-echo "第6步增加 |ts 任务日志输出时间戳..."
+
+
+echo "第6步删除不运行的脚本任务..."
+if [ $DO_NOT_RUN_SCRIPTS ]; then
+    echo "您配置了不运行的脚本：$DO_NOT_RUN_SCRIPTS"
+    arr=${DO_NOT_RUN_SCRIPTS//&/ }
+    for item in $arr; do
+        sed -ie '/'"${item}"'/d' /1.txt
+    done
+
+fi
+
+
+
+echo "第7步增加 |ts 任务日志输出时间戳..."
 sed -i "/\( ts\| |ts\|| ts\)/!s/>>/\|ts >>/g" $mergedListFile
 
-echo "第7步执行proc_file.sh脚本任务..."
+echo "第8步执行proc_file.sh脚本任务..."
 sh -x /scripts/docker/proc_file.sh
 
-echo "第8步加载最新的定时任务文件..."
+echo "第9步加载最新的定时任务文件..."
 crontab $mergedListFile
 
-echo "第9步将仓库的docker_entrypoint.sh脚本更新至系统/usr/local/bin/docker_entrypoint.sh内..."
+echo "第10步将仓库的docker_entrypoint.sh脚本更新至系统/usr/local/bin/docker_entrypoint.sh内..."
 cat /scripts/docker/docker_entrypoint.sh >/usr/local/bin/docker_entrypoint.sh

From 48f2ae73390a13b76dd65af8e7ee91eb71b2a384 Mon Sep 17 00:00:00 2001
From: AboutCXJ <AboutCXJ@gmail.com>
Date: Thu, 21 Jan 2021 10:20:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20DO=5FNOT=5FRUN=5FSC?=
 =?UTF-8?q?RIPTS=20=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E4=B8=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Readme.md b/docker/Readme.md
index 48437d02..95739f08 100644
--- a/docker/Readme.md
+++ b/docker/Readme.md
@@ -1,6 +1,10 @@
 ![Docker Pulls](https://img.shields.io/docker/pulls/lxk0301/jd_scripts?style=for-the-badge)
 ### Usage
 ```diff
++ 2021-01-21更新 增加 DO_NOT_RUN_SCRIPTS 参数配置不执行的脚本
++ 例:DO_NOT_RUN_SCRIPTS=jd_family&jd_dreamFactory&jd_jxnc
+
+
 + 2021-01-03更新 增加 CUSTOM_SHELL_FILE 参数配置执行自定义shell脚本
 + 例1:配置远程shell脚本, 我自己写了一个shell脚本https://raw.githubusercontent.com/iouAkira/someDockerfile/master/jd_scripts/shell_script_mod.sh 内容很简单下载惊喜农场并添加定时任务
 + CUSTOM_SHELL_FILE=https://raw.githubusercontent.com/iouAkira/someDockerfile/master/jd_scripts/shell_script_mod.sh