Ver Fonte

fix: 如果java环境不为orcalJdk的话,则创建临时java目录,编译时指定版本

kindring há 2 anos atrás
pai
commit
e3547f02d0
2 ficheiros alterados com 16 adições e 3 exclusões
  1. 16 0
      build.sh
  2. 0 3
      buildAll.sh

+ 16 - 0
build.sh

@@ -11,6 +11,22 @@ cd ./web_src
 yarn
 yarn build
 cd ../
+# 创建java临时目录
+# java -version 2>&1 | awk '/version/ {print $NF}' | egrep -q '^1\.8\.0_341'
+if java -version 2>&1 | awk '/version/ {print $NF}' | egrep -q '^1\.8\.0_341'; then
+    echo "当前Java环境为1.8,不自动安装"
+else
+    echo "当前Java环境不为1.8"
+    mkdir ./tmpJavaHome
+    tar -zxvf ./docker/gbDocker/jdk-8-linux-x64.tar.gz
+    mv ./docker/gbDocker/jdk1.8.0_341 ./tmpJavaHom
+    set JAVA_HOME=./tmpJavaHom/jdk1.8.0_341
+fi
+
+#export   CLASSPATH=.:$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
+#export   PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
+#export   JRE_HOME=$JAVA_HOME/jre
+
 mvn package
 mkdir ./docker/gbDocker/gb28181
 mkdir ./docker/gbDocker/gb28181/config

+ 0 - 3
buildAll.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "开始编译前端"
-cd ./web_src