From 0a261177c432e13c5f3cb7bbac5c7b438db5f071 Mon Sep 17 00:00:00 2001
From: iouAkira <e.akimoto.akira@gmail.com>
Date: Fri, 11 Dec 2020 14:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20=E5=A2=9E=E5=8A=A0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=8C=85=E5=90=AB=E5=BF=85=E9=A1=BB=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=B0=B1=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/default_task.sh      | 8 ++++++--
 docker/docker_entrypoint.sh | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docker/default_task.sh b/docker/default_task.sh
index 286268f7..aad63727 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -16,7 +16,6 @@ function getDockerImageLabel() {
 }
 ######################################获取docker构建文件里面的自定义信息方法-end#####################################################
 
-
 ######################################对比版本版本号大小方法-start###################################################################
 function version_gt() {
     test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
@@ -53,7 +52,6 @@ customListFile="/scripts/docker/$CUSTOM_LIST_FILE"
 mergedListFile="/scripts/docker/merged_list_file.sh"
 
 if type ts >/dev/null 2>&1; then
-    echo 'moreutils tools installed, default task append |ts output'
     echo '系统已安装moreutils工具包，默认定时任务增加｜ts 输出'
     ##复制一个新文件来追加|ts，防止git pull的时候冲突
     cp $defaultListFile /scripts/docker/default_list.sh
@@ -90,5 +88,11 @@ else
     cat $defaultListFile >$mergedListFile
 fi
 
+# 判断最后要加载的定时任务是否包含默认定时任务，不包含的话就加进去
+if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then
+    echo -e >>$mergedListFile
+    echo "52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile
+fi
+
 echo "加载最新的定时任务文件..."
 crontab $mergedListFile
diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh
index 737009d9..f36aa47d 100644
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -19,7 +19,7 @@ echo "##########################################################################
 ######################################获取docker构建文件里面的自定义信息方法-start#####################################################
 function getDockerImageLabel() {
     repo=akyakya/jd_scripts
-    imageTag=test
+    imageTag=dev
     token=$(curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull" | jq -r '.token')
     digest=$(curl -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/${repo}/manifests/${imageTag}" | jq .config.digest -r)
     labels=$(curl -s -L -H "Accept: application/vnd.docker.distribution.manifest.v2+json" -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/${repo}/blobs/$digest" | jq .config.Labels)
@@ -104,6 +104,12 @@ else
     cat $defaultListFile >$mergedListFile
 fi
 
+# 判断最后要加载的定时任务是否包含默认定时任务，不包含的话就加进去
+if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then
+    echo -e >>$mergedListFile
+    echo "52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile
+fi
+
 echo "Load the latest crontab task file..."
 echo "加载最新的定时任务文件..."
 crontab $mergedListFile