Merge pull request #149 from AboutCXJ/patch-1
新增DO_NOT_RUN_SCRIPTS字段,用于配置不执行的脚本
This commit is contained in:
@ -1,6 +1,10 @@
|
||||

|
||||
### 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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user