From 32386a13763d7508366f2ab6441f2da80fe40b6c Mon Sep 17 00:00:00 2001 From: zeaslity Date: Thu, 2 Mar 2023 09:38:38 +0800 Subject: [PATCH] =?UTF-8?q?[AGENT][SHELL]=20-=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E4=B8=8B=E8=BC=89=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/wdd/source/shell/agent-bootup.sh | 2 +- .../java/io/wdd/source/shell/agent-update.sh | 2 +- .../io/wdd/source/shell/lib/wdd-lib-sys.sh | 23 ++--- .../java/io/wdd/source/shell/server-bootup.sh | 2 +- .../src/main/java/io/wdd/source/shell/test.sh | 86 +++++++++++++------ 5 files changed, 73 insertions(+), 42 deletions(-) diff --git a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh index c4e91dc..a4ba29e 100644 --- a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh +++ b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh @@ -14,7 +14,7 @@ DependLibFiles=( OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/ -RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell +RepoSourcePath=https://happybirthday.107421.xyz/shell OctopusAgentPath=/octopus-agent/shell ##### environment variables ###### diff --git a/source/src/main/java/io/wdd/source/shell/agent-update.sh b/source/src/main/java/io/wdd/source/shell/agent-update.sh index 69ceeb3..309249c 100644 --- a/source/src/main/java/io/wdd/source/shell/agent-update.sh +++ b/source/src/main/java/io/wdd/source/shell/agent-update.sh @@ -6,7 +6,7 @@ . /octopus-agent/shell/lib/wdd-lib-os.sh -RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell +RepoSourcePath=https://happybirthday.107421.xyz/shell # 更新下载所有的内容 DownloadAllFile diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh index 3f1b8de..37e82e0 100644 --- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh +++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh @@ -135,29 +135,24 @@ FunctionEnd() { tmp () { -gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --metadata=startup-script=wget\ https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/agent-bootup.sh\ \&\&\ chmod\ \+x\ agent-bootup.sh\ \&\&\ /bin/bash\ agent-bootup.sh --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd1-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any + gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --metadata=startup-script=wget\ https://happybirthday.107421.xyz/shell/agent-bootup.sh\ \&\&\ chmod\ \+x\ agent-bootup.sh\ \&\&\ /bin/bash\ agent-bootup.sh --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd1-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any + gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any -gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any + gcloud compute ssh --zone "asia-northeast1-b" "tokyo-amd64-07" --project "compact-lacing-371804" -gcloud compute ssh --zone "asia-northeast1-b" "tokyo-amd64-07" --project "compact-lacing-371804" + gcloud compute instances list --project "compact-lacing-371804" -gcloud compute instances list --project "compact-lacing-371804" + wget https://happybirthday.107421.xyz/shell/agent-bootup.sh && chmod +x agent-bootup.sh && /bin/bash agent-bootup.sh - -wget https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/agent-bootup.sh && chmod +x agent-bootup.sh && /bin/bash agent-bootup.sh - - -echo "y + echo "y " | gcloud compute instances delete tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b + apt-cache madison openjdk-11-jdk | head -n 1 | awk '{print$3}' -apt-cache madison openjdk-11-jdk | head -n 1 | awk '{print$3}' + java -jar /octopus-agent/agent.jar -Xms128m -Xmx512m -Dfile.encoding=utf-8 --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s -java -jar /octopus-agent/agent.jar -Xms128m -Xmx512m -Dfile.encoding=utf-8 --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s - - -docker exec -it octopus-server /bin/bash -c "wget https://arthas.aliyun.com/arthas-boot.jar && java -jar arthas-boot.jar" + docker exec -it octopus-server /bin/bash -c "wget https://arthas.aliyun.com/arthas-boot.jar && java -jar arthas-boot.jar" } diff --git a/source/src/main/java/io/wdd/source/shell/server-bootup.sh b/source/src/main/java/io/wdd/source/shell/server-bootup.sh index 8bb3026..e611d66 100644 --- a/source/src/main/java/io/wdd/source/shell/server-bootup.sh +++ b/source/src/main/java/io/wdd/source/shell/server-bootup.sh @@ -10,7 +10,7 @@ OctopusServerContainerName="octopus-server" OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/ -RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell +RepoSourcePath=https://happybirthday.107421.xyz/shell OctopusAgentPath=/octopus-agent/shell ##### environment variables ###### diff --git a/source/src/main/java/io/wdd/source/shell/test.sh b/source/src/main/java/io/wdd/source/shell/test.sh index 85615d6..725ca64 100644 --- a/source/src/main/java/io/wdd/source/shell/test.sh +++ b/source/src/main/java/io/wdd/source/shell/test.sh @@ -1,37 +1,73 @@ -#!/bin/bash +TestFunction: + wget https://cdn.jsdelivr.net/gh/zeaslity/ProjectOctopus@master/source/src/main/java/io/wdd/source/shell/test.sh + chmod +x /root/test.sh -command_exists() { - command -v "$@" >/dev/null 2>&1 -} + /root/test.sh +--- +AgentBootUp: + rm -rf /root/agent-bootup* -command_exists "docker info" -if [[ $? -ne 0 ]] ; then -echo "no" -else -echo "yes" -fi + rm -rf /root/logs + rm -rf /root/nacos -dockerVersion="20.10.10" + wget https://happybirthday.107421.xyz/shell/agent-bootup.sh -O /root/agent-bootup.sh && chmod +x /root/agent-bootup.sh && /bin/bash /root/agent-bootup.sh -echo $dockerVersion | cut -d"." -f-2 +--- +AgentRestart: + rm -rf /octopus-agent/shell/agent-restart.sh + wget https://happybirthday.107421.xyz/shell/agent-restart.sh -O /octopus-agent/shell/agent-restart.sh -export JAVA_OPTS="-Xms2048m -Xmx2048m -Dfile.encoding=utf-8 -Dspring.profiles.active=k3s -Dspring.cloud.nacos.config.group=k3s -Dspring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml -Dspring.cloud.nacos.config.extension-configs[0].group=k3s -Ddebug=false -Dlogging.level.io.wdd.server=info" -export OctopusServerContainerName="octopus-server" + chmod +x /octopus-agent/shell/agent-restart.sh -docker container stop ${OctopusServerContainerName} -sleep 2 -docker container rm ${OctopusServerContainerName} -docker image rmi docker.io/icederce/wdd-octopus-server:latest + /octopus-agent/shell/agent-restart.sh +--- +AgentUpdate: + rm -rf /octopus-agent/shell/agent-update.sh + wget https://happybirthday.107421.xyz/shell/agent-update.sh -O /octopus-agent/shell/agent-update.sh - systemctl status nginx.service | grep -c "active (running)" + chmod +x /octopus-agent/shell/agent-update.sh -docker logs --tail 500 -f ${ServerContainerName} -docker run -d \ - -p 9999:9999 \ - --name ${OctopusServerContainerName} \ - --env JAVA_OPTS="${JAVA_OPTS}" \ - docker.io/icederce/wdd-octopus-server:latest \ No newline at end of file + /octopus-agent/shell/agent-update.sh +--- +AgentShutdown: + rm -rf /octopus-agent/shell/agent-shutdown.sh + + wget https://happybirthday.107421.xyz/shell/agent-shutdown.sh -O /octopus-agent/shell/agent-shutdown.sh + + chmod +x /octopus-agent/shell/agent-shutdown.sh + + /octopus-agent/shell/agent-shutdown.sh +--- +# https://github.com/XTLS/Xray-install +XrayInstall: + + wget https://cdn.jsdelivr.net/gh/XTLS/Xray-install@main/install-release.sh -O /root/xray-install.sh + + chmod +x /root/xray-install.sh + + /root/xray-install.sh install -u root + + curl -oL /usr/local/share/xray/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat + + curl -oL /usr/local/share/xray/geosite.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + + systemctl restart xray.service + +--- +OracleKeepAlived-Deprecated: + apt-get install cpulimit -y + + mkdir -p /octopus-agent/shell/function + + wget https://happybirthday.107421.xyz/shell/function/load50cpu_2_hour.sh -O /octopus-agent/shell/function/load50cpu_2_hour.sh + + chmod +x /octopus-agent/shell/function/load50cpu_2_hour.sh + + cpulimit -l 20 /octopus-agent/shell/function/load50cpu_2_hour.sh >/dev/null & +--- +TestFunction: + echo yes