diff --git a/docker/default_task.sh b/docker/default_task.sh index d8bccffe..da61c000 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -25,9 +25,10 @@ function version_gt() { #######################################通知用户更新镜像-start##################################################################### echo "检查docker镜像更新更新..." if type jq >/dev/null 2>&1; then + echo "获取dockerhub仓库镜像labels信息..." labels=$(getDockerImageLabel) - export NOTIFY_CONTENT=$(echo $labels | jq .UPDATE_CONTENT) - version=$(echo $labels | jq .VERSION) + export NOTIFY_CONTENT=$(echo $labels | jq -r .UPDATE_CONTENT) + version=$(echo $labels | jq -r .VERSION) else # 第一版通知逻辑无法包含在上面判断里面,镜像构建好直接开启通知 echo "当前容版版本过旧,发送镜像更新通知" diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh index ebc1e8ff..9b818252 100644 --- a/docker/docker_entrypoint.sh +++ b/docker/docker_entrypoint.sh @@ -37,9 +37,11 @@ function version_gt() { echo "check docker images update..." echo "检查docker镜像更新更新..." if type jq >/dev/null 2>&1; then + echo "get dockerhub repo images labels..." + echo "获取dockerhub仓库镜像labels信息..." labels=$(getDockerImageLabel) - export NOTIFY_CONTENT=$(echo $labels | jq .UPDATE_CONTENT) - version=$(echo $labels | jq .VERSION) + export NOTIFY_CONTENT=$(echo $labels | jq -r .UPDATE_CONTENT) + version=$(echo $labels | jq -r .VERSION) else # 第一版通知逻辑无法包含在上面判断里面,镜像构建好直接开启通知 echo "Current container version is too old, send update notification"