sinvo/jd_scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
iouAkira
2021-03-26 16:55:48 +08:00
parent 2b758c8f8d
commit f2018640d5
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/default_task.sh
View File

@@ -112,6 +112,9 @@ EOF
fi fi
echo "暂停更新配置，不要尝试删掉这个文件，你的容器可能会起不来"
echo '' >/scripts/logs/pull.lock
echo "定义定时任务合并处理用到的文件路径..." echo "定义定时任务合并处理用到的文件路径..."
defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE" defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE"
echo "默认文件定时任务文件路径为 ${defaultListFile}" echo "默认文件定时任务文件路径为 ${defaultListFile}"
@@ -246,4 +249,4 @@ cat /scripts/docker/docker_entrypoint.sh >/usr/local/bin/docker_entrypoint.sh
echo "发送通知" echo "发送通知"
export NOTIFY_CONTENT="2021-03-21更新 增加bot交互，spnode指令，功能是否开启自动根据你的配置判断，详见 https://gitee.com/lxk0301/jd_docker/pulls/18" export NOTIFY_CONTENT="2021-03-21更新 增加bot交互，spnode指令，功能是否开启自动根据你的配置判断，详见 https://gitee.com/lxk0301/jd_docker/pulls/18"
cd /scripts/docker cd /scripts/docker
node notify_docker_user.js node notify_docker_user.js

21
docker/docker_entrypoint.sh
View File

@@ -6,15 +6,18 @@ if [ -n "$1" ]; then
run_cmd=$1 run_cmd=$1
fi fi
echo "设定远程仓库地址..." if [ -f "/scripts/logs/pull.lock" ]; then
cd /scripts echo "存在更新锁定文件，跳过git pull操作..."
git remote set-url origin "$REPO_URL" else
git reset --hard echo "设定远程仓库地址..."
echo "git pull拉取最新代码..." cd /scripts
git -C /scripts pull --rebase git remote set-url origin "$REPO_URL"
echo "npm install 安装最新依赖" git reset --hard
npm install --prefix /scripts echo "git pull拉取最新代码..."
git -C /scripts pull --rebase
echo "npm install 安装最新依赖"
npm install --prefix /scripts
fi
# 默认启动telegram交互机器人的条件 # 默认启动telegram交互机器人的条件
# 确认容器启动时调用的docker_entrypoint.sh # 确认容器启动时调用的docker_entrypoint.sh