From 03cf75a3908b29b5d1637e451bf9bc6532dbf6f9 Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Sat, 16 Jan 2021 22:43:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 7bd69cff..8ccd94b3 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -83,7 +83,7 @@ echo "第7步增加 |ts 任务日志输出时间戳..."
 sed -i "/\( ts\| |ts\|| ts\)/!s/>>/\|ts >>/g" $mergedListFile
 
 echo "第8步执行proc_file.sh脚本任务..."
-sh -x /scripts/docker/shell_script_mod.sh
+sh -x /scripts/docker/proc_file.sh
 
 echo "第9步加载最新的定时任务文件..."
 crontab $mergedListFile

From 773d1bb947f4825e7d05f2a8604e121ba6f33621 Mon Sep 17 00:00:00 2001
From: Akira <e.akimoto.akira@gmail.com>
Date: Sat, 16 Jan 2021 22:47:33 +0800
Subject: [PATCH 2/2] Update docker_entrypoint.sh

---
 docker/docker_entrypoint.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh
index adb73005..6fc71550 100644
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+#获取配置的自定义参数
+if [ $1 ]; then
+    run_cmd=$1
+fi
+
 echo "设定远程仓库地址..."
 cd /scripts
 git remote set-url origin $REPO_URL
@@ -14,7 +19,7 @@ echo "------------------------------------------------执行定时任务任务sh
 sh -x /scripts/docker/default_task.sh
 echo "--------------------------------------------------默认定时任务执行完成---------------------------------------------------"
 
-if [ $run_cmd == 'crond' ]; then
+if [ $run_cmd ]; then
     echo "Start crontab task main process..."
     echo "启动crondtab定时任务主进程..."
     crond -f