From 808b5780aabb4974db622f16710bc64625a60d6b Mon Sep 17 00:00:00 2001 From: InkerBot Date: Sun, 23 Jun 2024 02:14:58 +0800 Subject: [PATCH] fix unmatched --- install-alpine.sh | 14 ++++++++++++-- install-ubuntu.sh | 10 +++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/install-alpine.sh b/install-alpine.sh index b9df5c1..1cd9b09 100644 --- a/install-alpine.sh +++ b/install-alpine.sh @@ -5,11 +5,21 @@ wget -O buildAgentFull.zip https://teamcity.nld.inker.bot/update/buildAgentFull- unzip buildAgentFull.zip -d /opt/agent rm -f buildAgentFull.zip -wget -O /lib/systemd/system/teamcityagent.service https://git.inker.bot/inksnow/teamcity-agent-install/raw/branch/main/teamcityagent.service +wget -O zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz +tar -xzvf zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz +rm -rf zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz /opt/agent/jre +mv zulu17.50.19-ca-jdk17.0.11-linux_musl_x64 /opt/agent/jre + +wget -O /etc/init.d/teamcityagent https://git.inker.bot/inksnow/teamcity-agent-install/raw/branch/main/alpine/teamcityagent +chmod +x /etc/init.d/teamcityagent sed -i 's/http:\/\/localhost:8111\//https:\/\/teamcity.nld.inker.bot\//g' /root/agent/conf/buildAgent.properties sed -i "s/Default Agent/$(hostname)/g" /root/agent/conf/buildAgent.properties +rc-update add docker +rc-service docker start docker run --privileged --rm tonistiigi/binfmt --install all docker rmi tonistiigi/binfmt -systemctl enable --now teamcityagent + +rc-update add teamcityagent +rc-service teamcityagent start diff --git a/install-ubuntu.sh b/install-ubuntu.sh index 15beadd..8bd7ba7 100644 --- a/install-ubuntu.sh +++ b/install-ubuntu.sh @@ -11,17 +11,13 @@ tar -xzvf zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz rm -rf zulu17.50.19-ca-jdk17.0.11-linux_musl_x64.tar.gz /opt/agent/jre mv zulu17.50.19-ca-jdk17.0.11-linux_musl_x64 /opt/agent/jre - -wget -O /etc/init.d/teamcityagent https://git.inker.bot/inksnow/teamcity-agent-install/raw/branch/main/alpine/teamcityagent -chmod +x /etc/init.d/teamcityagent +wget -O /lib/systemd/system/teamcityagent.service https://git.inker.bot/inksnow/teamcity-agent-install/raw/branch/main/teamcityagent.service sed -i 's/http:\/\/localhost:8111\//https:\/\/teamcity.nld.inker.bot\//g' /opt/agent/conf/buildAgent.properties sed -i "s/Default Agent/$(hostname)/g" /opt/agent/conf/buildAgent.properties -rc-update add docker -rc-service docker start +systemctl enable --now docker docker run --privileged --rm tonistiigi/binfmt --install all docker rmi tonistiigi/binfmt -rc-update add teamcityagent -rc-service teamcityagent start +systemctl enable --now teamcityagent