summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuai <[email protected]>2022-07-08 14:12:41 +0800
committerzhangshuai <[email protected]>2022-07-08 14:12:41 +0800
commit62889f35d2d01c95791edf185c03d17a3864547d (patch)
treee38a872ccc8fe7c497499eddce605fdbe7ce24de
parent1b245c1efb1cfab5666e65a9d2ab05ed63f1e89f (diff)
fix: package 打包增加agent版本信息文件rel-22.05.06
-rw-r--r--tools/package.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/package.sh b/tools/package.sh
index 789a16d..90da816 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -36,7 +36,11 @@ mkdir -p $RPM_AGENT_PATH/config
echo 'packaging begin ...'
# mvn 编译
-echo -e version=${PACKAGE_VERSION}"\n"commit=$CI_COMMIT_SHORT_SHA"\n"buildDate=`date +'%Y%m%d%H%m%S'` > ./src/main/resources/version.properties
+cat >./src/main/resources/version.properties<<EOF
+version=${PACKAGE_VERSION}
+commit=$CI_COMMIT_SHORT_SHA
+buildDate=`date +'%Y%m%d%H%m%S'`
+EOF
mvn clean install -Dxjar.password=2q667Gykpr36Thcjf4JK -Dxjar.excludes=/db/*,/static/**/*
cd ./target && go build xjar.go
cd $CUR_PWD
@@ -44,7 +48,7 @@ cd $CUR_PWD
chmod +x ./target/xjar
cp -f ./target/nz-agent.xjar $RPM_AGENT_PATH
cp -f ./target/xjar $RPM_AGENT_PATH
-cp -f ./src/main/resources/{application-prod.yml,logback-spring.xml,config/auth.yml,config/token.auth,config/lokiPushUrls.yml,version.properties} ${RPM_AGENT_PATH}/config
+cp -f ./src/main/resources/{application-prod.yml,logback-spring.xml,config/auth.yml,config/token.auth,config/lokiPushUrls.yml} ${RPM_AGENT_PATH}/config
sed -i 's/<property name="log.path" value=".*"/<property name="log.path" value="\/var\/log\/nezha\/nz-agent\/"/g' ${RPM_AGENT_PATH}/config/logback-spring.xml
# 准备 prometheus 编译目录