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 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