From c5d92551c510e26981406fd8dfcb4edf0608b60e Mon Sep 17 00:00:00 2001
From: iouAkira <e.akimoto.akira@gmail.com>
Date: Fri, 26 Mar 2021 16:55:48 +0800
Subject: [PATCH] fix

---
 docker/default_task.sh      |  5 ++++-
 docker/docker_entrypoint.sh | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docker/default_task.sh b/docker/default_task.sh
index c674ddd7..d9556298 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -112,6 +112,9 @@ EOF
 
 fi
 
+echo "暂停更新配置，不要尝试删掉这个文件，你的容器可能会起不来"
+echo '' >/scripts/logs/pull.lock
+
 echo "定义定时任务合并处理用到的文件路径..."
 defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE"
 echo "默认文件定时任务文件路径为 ${defaultListFile}"
@@ -246,4 +249,4 @@ cat /scripts/docker/docker_entrypoint.sh >/usr/local/bin/docker_entrypoint.sh
 echo "发送通知"
 export NOTIFY_CONTENT="2021-03-21更新 增加bot交互，spnode指令，功能是否开启自动根据你的配置判断，详见 https://gitee.com/lxk0301/jd_docker/pulls/18"
 cd /scripts/docker
-node notify_docker_user.js
\ No newline at end of file
+node notify_docker_user.js
diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh
index b07c23b9..5e0f0990 100644
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -6,15 +6,18 @@ if [ -n "$1" ]; then
   run_cmd=$1
 fi
 
-echo "设定远程仓库地址..."
-cd /scripts
-git remote set-url origin "$REPO_URL"
-git reset --hard
-echo "git pull拉取最新代码..."
-git -C /scripts pull --rebase
-echo "npm install 安装最新依赖"
-npm install --prefix /scripts
-
+if [ -f "/scripts/logs/pull.lock" ]; then
+  echo "存在更新锁定文件，跳过git pull操作..."
+else
+  echo "设定远程仓库地址..."
+  cd /scripts
+  git remote set-url origin "$REPO_URL"
+  git reset --hard
+  echo "git pull拉取最新代码..."
+  git -C /scripts pull --rebase
+  echo "npm install 安装最新依赖"
+  npm install --prefix /scripts
+fi
 
 # 默认启动telegram交互机器人的条件
 # 确认容器启动时调用的docker_entrypoint.sh