增加容器启动入口文件，整理参数配置数据
This commit is contained in:
iouAkira
@@ -1,6 +1,5 @@
|
||||
50 */1 * * * git -C /scripts/ pull >> /scripts/logs/pull.log 2>&1
|
||||
52 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
|
||||
53 */1 * * * npm install --prefix /scripts >> /scripts/logs/npm_install.log 2>&1
|
||||
#必须要的默认定时任务请勿删除
|
||||
52 */1 * * * sh /scripts/default_task.sh |ts >> /scripts/logs/pull.log 2>&1
|
||||
# 每3天的23:50分清理一次日志
|
||||
50 23 */3 * * rm -rf /scripts/logs/*.log
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
50 */1 * * * git -C /scripts/ pull |ts >> /scripts/logs/pull.log 2>&1
|
||||
52 */1 * * * crontab /scripts/docker/${CRONTAB_LIST_FILE}
|
||||
53 */1 * * * npm install --prefix /scripts |ts >> /scripts/logs/npm_install.log 2>&1
|
||||
#必须要的默认定时任务请勿删除
|
||||
52 */1 * * * sh /scripts/default_task.sh |ts >> /scripts/logs/pull.log 2>&1
|
||||
# 每3天的23:50分清理一次日志
|
||||
50 23 */3 * * rm -rf /scripts/logs/*.log
|
||||
|
||||
|
||||
94
docker/default_task.sh
Normal file
94
docker/default_task.sh
Normal file
@@ -0,0 +1,94 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
echo "定时任务更新代码，git 拉取最新代码，并安装更新依赖..."
|
||||
git -C /scripts pull
|
||||
npm install --prefix /scripts
|
||||
|
||||
######################################获取docker构建文件里面的自定义信息方法-start#####################################################
|
||||
function getDockerImageLabel() {
|
||||
repo=akyakya/jd_scripts
|
||||
imageTag=test
|
||||
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)
|
||||
echo $labels
|
||||
}
|
||||
######################################获取docker构建文件里面的自定义信息方法-end#####################################################
|
||||
|
||||
|
||||
######################################对比版本版本号大小方法-start###################################################################
|
||||
function version_gt() {
|
||||
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
|
||||
}
|
||||
######################################对比版本版本号大小方法-end###################################################################
|
||||
#######################################通知用户更新镜像-start#####################################################################
|
||||
if type jq >/dev/null 2>&1; then
|
||||
updateContext=$(getDockerImageLabel ｜ jq .UPDATE_CONTEXT)
|
||||
version=$(getDockerImageLabel ｜ jq .VERSION)
|
||||
fi
|
||||
|
||||
#通知通知用户更新镜像
|
||||
if [ ! $BUILD_VERSION ]; then
|
||||
if [ $version ]; then
|
||||
cd /scripts/docker
|
||||
node notify_docker_user.js
|
||||
fi
|
||||
else
|
||||
if version_gt $version $BUILD_VERSION; then
|
||||
cd /scripts/docker
|
||||
node notify_docker_user.js
|
||||
fi
|
||||
fi
|
||||
#######################################通知用户更新镜像-end#####################################################################
|
||||
|
||||
##兼容旧镜像的环境变量
|
||||
if [ !$DEFAULT_LIST_FILE ]; then
|
||||
defaultListFile="/scripts/docker/crontab_list.sh"
|
||||
else
|
||||
defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE"
|
||||
fi
|
||||
|
||||
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
|
||||
defaultListFile="/scripts/docker/default_list.sh"
|
||||
|
||||
sed -i 's/>>/|ts >>/g' $defaultListFile
|
||||
fi
|
||||
|
||||
echo "定时任务合并加载最新定时任务列表..."
|
||||
#判断 自定义文件是否存在 是否存在
|
||||
if [ $CUSTOM_LIST_FILE ]; then
|
||||
echo "您配置了自定义任务文件：$CUSTOM_LIST_FILE，自定义任务类型为：$CUSTOM_LIST_MERGE_TYPE..."
|
||||
if [ -f "$customListFile" ]; then
|
||||
if [ $CUSTOM_LIST_MERGE_TYPE == "append" ]; then
|
||||
echo "合并默认定时任务文件：$DEFAULT_LIST_FILE 和 自定义定时任务文件：$CUSTOM_LIST_FILE"
|
||||
cat $defaultListFile >$mergedListFile
|
||||
echo -e "" >>$mergedListFile
|
||||
cat $customListFile >>$mergedListFile
|
||||
elif [ $CUSTOM_LIST_MERGE_TYPE == "overwrite" ]; then
|
||||
cat $customListFile >$mergedListFile
|
||||
echo "$CUSTOM_LIST_FILE but file ..."
|
||||
echo "配置了自定义任务文件：$CUSTOM_LIST_FILE，自定义任务类型为：$CUSTOM_LIST_MERGE_TYPE..."
|
||||
touch "$customListFile"
|
||||
else
|
||||
echo "配置配置了错误的自定义定时任务类型：$CUSTOM_LIST_MERGE_TYPE，自定义任务类型为只能为append或者overwrite..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
else
|
||||
echo "配置的自定义任务文件：$CUSTOM_LIST_FILE未找到，使用默认配置$DEFAULT_LIST_FILE..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
else
|
||||
echo "当前使用的为默认定时任务文件 $DEFAULT_LIST_FILE ..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
|
||||
echo "加载最新的定时任务文件..."
|
||||
crontab $mergedListFile
|
||||
113
docker/docker_entrypoint.sh
Normal file
113
docker/docker_entrypoint.sh
Normal file
@@ -0,0 +1,113 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
export LANG="zh_CN.UTF-8"
|
||||
|
||||
if [ $1 ]; then
|
||||
echo "Currently does not support specifying startup parameters"
|
||||
echo "Please delete the last command attached to $(docker run) or the configured $(command:) parameter in $(docker-compose.yml)"
|
||||
echo "暂时不支持指定启动参数，请删除 docker run时最后附带的命令 或者 docker-compose.yml中的配置的command:指令 "
|
||||
fi
|
||||
|
||||
echo "##############################################################################"
|
||||
echo "Container start , Pull the latest code..."
|
||||
echo "容器启动，git 拉取最新代码..."
|
||||
git -C /scripts pull
|
||||
npm install --prefix /scripts
|
||||
echo "##############################################################################"
|
||||
|
||||
######################################获取docker构建文件里面的自定义信息方法-start#####################################################
|
||||
function getDockerImageLabel() {
|
||||
repo=akyakya/jd_scripts
|
||||
imageTag=test
|
||||
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)
|
||||
echo $labels
|
||||
}
|
||||
######################################获取docker构建文件里面的自定义信息方法-end#####################################################
|
||||
|
||||
|
||||
######################################对比版本版本号大小方法-start###################################################################
|
||||
function version_gt() {
|
||||
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
|
||||
}
|
||||
######################################对比版本版本号大小方法-end###################################################################
|
||||
#######################################通知用户更新镜像-start#####################################################################
|
||||
if type jq >/dev/null 2>&1; then
|
||||
updateContext=$(getDockerImageLabel ｜ jq .UPDATE_CONTEXT)
|
||||
version=$(getDockerImageLabel ｜ jq .VERSION)
|
||||
fi
|
||||
|
||||
#通知通知用户更新镜像
|
||||
if [ ! $BUILD_VERSION ]; then
|
||||
if [ $version ]; then
|
||||
cd /scripts/docker
|
||||
node notify_docker_user.js
|
||||
fi
|
||||
else
|
||||
if version_gt $version $BUILD_VERSION; then
|
||||
cd /scripts/docker
|
||||
node notify_docker_user.js
|
||||
fi
|
||||
fi
|
||||
#######################################通知用户更新镜像-end#####################################################################
|
||||
|
||||
##兼容旧镜像的环境变量
|
||||
if [ !$DEFAULT_LIST_FILE ]; then
|
||||
defaultListFile="/scripts/docker/crontab_list.sh"
|
||||
else
|
||||
defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE"
|
||||
fi
|
||||
|
||||
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
|
||||
defaultListFile="/scripts/docker/default_list.sh"
|
||||
|
||||
sed -i 's/>>/|ts >>/g' $defaultListFile
|
||||
fi
|
||||
|
||||
#判断 自定义文件是否存在 是否存在
|
||||
if [ $CUSTOM_LIST_FILE ]; then
|
||||
echo "You have configured a custom list file: $CUSTOM_LIST_FILE, custom list merge type: $CUSTOM_LIST_MERGE_TYPE..."
|
||||
echo "您配置了自定义任务文件：$CUSTOM_LIST_FILE，自定义任务类型为：$CUSTOM_LIST_MERGE_TYPE..."
|
||||
if [ -f "$customListFile" ]; then
|
||||
if [ $CUSTOM_LIST_MERGE_TYPE == "append" ]; then
|
||||
echo "merge default list file: $DEFAULT_LIST_FILE and custom list file: $CUSTOM_LIST_FILE"
|
||||
echo "合并默认定时任务文件：$DEFAULT_LIST_FILE 和 自定义定时任务文件：$CUSTOM_LIST_FILE"
|
||||
cat $defaultListFile >$mergedListFile
|
||||
echo -e "" >>$mergedListFile
|
||||
cat $customListFile >>$mergedListFile
|
||||
elif [ $CUSTOM_LIST_MERGE_TYPE == "overwrite" ]; then
|
||||
cat $customListFile >$mergedListFile
|
||||
echo "merge custom list file: $CUSTOM_LIST_FILE..."
|
||||
echo "合并自定义任务文件：$CUSTOM_LIST_FILE"
|
||||
touch "$customListFile"
|
||||
else
|
||||
echo "配置配置了错误的自定义定时任务类型：$CUSTOM_LIST_MERGE_TYPE，自定义任务类型为只能为append或者overwrite..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
else
|
||||
echo "Not found custom list file: $CUSTOM_LIST_FILE ,use default list file: $DEFAULT_LIST_FILE"
|
||||
echo "自定义任务文件：$CUSTOM_LIST_FILE 未找到，使用默认配置$DEFAULT_LIST_FILE..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
else
|
||||
echo "The currently used is the default crontab task file: $DEFAULT_LIST_FILE ..."
|
||||
echo "当前使用的为默认定时任务文件 $DEFAULT_LIST_FILE ..."
|
||||
cat $defaultListFile >$mergedListFile
|
||||
fi
|
||||
|
||||
echo "Load the latest crontab task file..."
|
||||
echo "加载最新的定时任务文件..."
|
||||
crontab $mergedListFile
|
||||
|
||||
echo "Start crontab task main process..."
|
||||
echo "启动crondtab定时任务主进程..."
|
||||
crond -f
|
||||
Reference in New Issue
Block a user