diff options
| author | fangshunjian <[email protected]> | 2022-12-14 11:39:42 +0800 |
|---|---|---|
| committer | fangshunjian <[email protected]> | 2022-12-14 11:39:42 +0800 |
| commit | de3347b3c517339186e88870a55d5eaa0757281a (patch) | |
| tree | 43d9a561b1f7a0e4902ea2d7ecd79478af37802c | |
| parent | 27f46633fc5dd8ca27b3682550b503adb6692be7 (diff) | |
perf: NEZ-2463 编译rpm时打包jdk依赖rel-23.01.01rel-22.10.02
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | tools/afterinstall.sh | 6 | ||||
| -rw-r--r-- | tools/package.sh | 8 |
3 files changed, 14 insertions, 2 deletions
@@ -149,7 +149,7 @@ <pluginRepository> <id>nexus</id> <name>Team Nexus Repository</name> - <url>http://192.168.40.125:8099/content/groups/public/</url> + <url>http://192.168.40.153:8099/content/groups/public/</url> </pluginRepository> <pluginRepository> <id>public</id> diff --git a/tools/afterinstall.sh b/tools/afterinstall.sh index 589002f..6715ff3 100644 --- a/tools/afterinstall.sh +++ b/tools/afterinstall.sh @@ -1,7 +1,11 @@ #!/bin/sh +WORK_DIR=/opt/nezha/nz-talon + # Find Java -if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then +if [[ -x "$WORK_DIR/jdk/bin/java" ]]; then + JAVA_EXE="$WORK_DIR/jdk/bin/java" +elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then JAVA_EXE="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then JAVA_EXE=$(type -p java) diff --git a/tools/package.sh b/tools/package.sh index 9d4ad5a..c9fa564 100644 --- a/tools/package.sh +++ b/tools/package.sh @@ -11,6 +11,8 @@ if [[ "${BRANCH_ARRAY[0]}" == "rel" ]] ; then fi RPM_FULL_NAME=${PACKAGE_NAME}-${PACKAGE_VERSION}-${ITERATION}.x86_64.rpm +# 依赖jdk 文件名 +JDK_FILENAME=jdk-8u202-linux-x64.tar.gz # 初始化 minio mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD @@ -19,9 +21,11 @@ mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD BUILD_PATH=$CUR_PWD/build RPM_TALON_PATH=$BUILD_PATH/opt/nezha/nz-talon RPM_PROMTAIL_PATH=$BUILD_PATH/opt/nezha/promtail +RPM_JDK_PATH=$RPM_TALON_PATH/jdk mkdir -p $RPM_TALON_PATH $RPM_PROMTAIL_PATH mkdir -p $RPM_TALON_PATH/config +mkdir -p $RPM_JDK_PATH echo 'packaging nz-talon ...' #添加版本信息 @@ -41,6 +45,10 @@ cp -f ./target/xjar $RPM_TALON_PATH cp -f ./src/main/resources/{application-prod.yml,application.yml,logback-spring.xml,config/auth.yml,config/token.auth,config/promtail.version} ${RPM_TALON_PATH}/config sed -i 's/<property name="log.path" value=".*"/<property name="log.path" value="\/var\/log\/nezha\/nz-talon\/"/g' ${RPM_TALON_PATH}/config/logback-spring.xml +# 准备 jdk 编译目录 +mc cp nz/depends/jdk/$JDK_FILENAME ./ +tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH + # 下载 promtail mc cp nz/depends/loki/promtail-linux-amd64.zip ./ unzip -o promtail-linux-amd64.zip -d $RPM_PROMTAIL_PATH |