Merge remote-tracking branch 'origin/dev-3.7' into dev-3.8

This commit is contained in:
shizhendong
2023-09-25 14:12:59 +08:00

View File

@@ -51,8 +51,8 @@ mc cp nz/depends/jdk/$JDK_FILENAME ./
tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH
# 下载 promtail # 下载 promtail
mc cp nz/depends/loki/promtail-linux-amd64.zip ./ mc cp nz/depends/loki/promtail-2.9.0.linux-amd64.zip ./
unzip -o promtail-linux-amd64.zip -d $RPM_PROMTAIL_PATH unzip -o promtail-2.9.0.linux-amd64.zip -d $RPM_PROMTAIL_PATH
mv $RPM_PROMTAIL_PATH/promtail-linux-amd64 $RPM_PROMTAIL_PATH/promtail mv $RPM_PROMTAIL_PATH/promtail-linux-amd64 $RPM_PROMTAIL_PATH/promtail
cp -f ./tools/config.conf $RPM_PROMTAIL_PATH cp -f ./tools/config.conf $RPM_PROMTAIL_PATH
cp -f ./tools/promtail.yaml $RPM_PROMTAIL_PATH cp -f ./tools/promtail.yaml $RPM_PROMTAIL_PATH