diff --git a/agent-go/a_executor/BaseFunction.go b/agent-go/a_executor/BaseFunction.go index a138462..c7504a9 100755 --- a/agent-go/a_executor/BaseFunction.go +++ b/agent-go/a_executor/BaseFunction.go @@ -2329,8 +2329,7 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [ } } - // run docker command - ok, resultLog := AllCommandExecutor([]string{ + chronyCommand := []string{ "docker", "run", "--name=chrony", @@ -2338,12 +2337,20 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [ "--detach", "--cap-add=SYS_TIME", "--publish=123:123/udp", - "--env=NTP_SERVERS=\"ntp1.aliyun.com,ntp2.aliyun.com,ntp3.aliyun.com,ntp4.aliyun.com\"", "--env=LOG_LEVEL=0", "--env=TZ=Asia/Shanghai", "--env=ENABLE_SYSCLK=true", - funcArgs[0] + ":8033/cmii/chronyd:0.4.3", - }) + } + if op.CanAccessInternet { + chronyCommand = append(chronyCommand, "--env=NTP_SERVERS=\"ntp1.aliyun.com,ntp2.aliyun.com,ntp3.aliyun.com,ntp4.aliyun.com\"") + } else { + chronyCommand = append(chronyCommand, "--env=NTP_SERVERS=127.127.1.1") + } + + chronyCommand = append(chronyCommand, funcArgs[0]+":8033/cmii/chronyd:0.4.3") + + // run docker command + ok, resultLog := AllCommandExecutor(chronyCommand) if !ok { return false, append(resultLog, "[installChronyByDockerExec] - docker chrony run error !") } @@ -2456,6 +2463,8 @@ func (op *AgentOsOperator) chronyToMasterExec(args []string) (bool, []string) { } } + // ubuntu + // modify the systemd-timesync.service ntpFile := "/etc/systemd/timesyncd.conf" AllCommandExecutor([]string{ diff --git a/agent-operator/ImageSyncDLTU.sh b/agent-operator/ImageSyncDLTU.sh index 55abf68..353fb8a 100644 --- a/agent-operator/ImageSyncDLTU.sh +++ b/agent-operator/ImageSyncDLTU.sh @@ -4,6 +4,7 @@ all_image_list_txt="all-cmii-image-list.txt" # 需要修改版本 gzip_image_list_txt="all-gzip-image-list.txt" # 一般不需要修改 oss_prefix_url="https://oss.demo.uavcmlc.com/cmlc-installation" local_gzip_path="/root/wdd/octopus_image" + DockerRegisterDomain="10.40.51.5:8033" # 需要根据实际修改 HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 @@ -48,7 +49,6 @@ Download_Load_Tag_Upload() { print_red "bad arguments" ;; esac - shift # past argument or value done } @@ -95,10 +95,57 @@ dltu() { } +Load_Tag_Upload(){ + print_green "[LTU] - start to load image from offline !" + + while [[ $# -gt 0 ]]; do + case "$1" in + rke) + # print_green "download rke " + local_gzip_path="$local_gzip_path/rke" + mkdir -p ${local_gzip_path} + oss_prefix_url="$oss_prefix_url/rke/" + ltu + shift # past argument + ;; + middle) + local_gzip_path="$local_gzip_path/middle" + mkdir -p $local_gzip_path + oss_prefix_url="$oss_prefix_url/middle/" + ltu + shift # past argument + ;; + cmii) + local_gzip_path="$local_gzip_path/cmii" + mkdir -p $local_gzip_path + oss_prefix_url="$oss_prefix_url/cmii/" + ltu + shift # past argument + ;; + *) + # unknown option + print_red "bad arguments" + ;; + esac + shift # past argument or value + done + +} + +ltu(){ + while IFS= read -r file; do + [ -z "${file}" ] && continue + echo "read gzip file full name is $file" + done < "$(find $local_gzip_path -type f -name "*.tar.gz")" +} + + test(){ app_name=$(echo "nginx:latest" | sed 's|.*/||g') echo "extract short name is $app_name" } # test -Download_Load_Tag_Upload "middle" "cmii" +#Download_Load_Tag_Upload "rke" "middle" "cmii" + +Load_Tag_Upload "rke" \ No newline at end of file