脚本调整.

2023-04-05 17:36:52 +08:00
parent 87e6c066ed
commit 4258845985
17 changed files with 27 additions and 10 deletions
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <artifactId>neutrino-proxy-parent</artifactId>
+        <artifactId>neutrino-proxy</artifactId>
        <groupId>org.dromara.neutrino-proxy</groupId>
        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <artifactId>neutrino-proxy-parent</artifactId>
+        <artifactId>neutrino-proxy</artifactId>
        <groupId>org.dromara.neutrino-proxy</groupId>
        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <artifactId>neutrino-proxy-parent</artifactId>
+        <artifactId>neutrino-proxy</artifactId>
        <groupId>org.dromara.neutrino-proxy</groupId>
        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
@@ -12,7 +12,7 @@
    </parent>

    <groupId>org.dromara.neutrino-proxy</groupId>
-    <artifactId>neutrino-proxy-parent</artifactId>
+    <artifactId>neutrino-proxy</artifactId>
    <packaging>pom</packaging>
    <version>${revision}</version>

@@ -17,7 +17,7 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"

 #初始化文件夹
-cd ..
+cd ../..
 rm -rf $adminDeployDir
 if [ ! -d "$deployDir" ];then
  mkdir $deployDir
@@ -17,7 +17,7 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"

 #初始化文件夹
-cd ..
+cd ../..
 rm -rf $adminDeployDir
 if [ ! -d "$deployDir" ];then
  mkdir $deployDir
@@ -9,7 +9,7 @@ deployDir="deploy"
 clientDeployDir=$deployDir"/client"

 #切到项目根目录
-cd ..
+cd ../..
 #初始化文件夹
 if [ ! -d "$deployDir" ];then
  mkdir $deployDir
@@ -8,7 +8,7 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/li
 mkdir -p /work/$NAME/heapError/

 NAME=neutrino-proxy-client
-WORK=$PWD/../deploy/client
+WORK=$PWD/../../deploy/client
 OUT=$WORK/$NAME.out
 JAR_PATH=$WORK

@@ -9,7 +9,7 @@ deployDir="deploy"
 serverDeployDir=$deployDir"/server"

 #切到项目根目录
-cd ..
+cd ../..
 #初始化文件夹
 if [ ! -d "$deployDir" ];then
  mkdir $deployDir
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# 镜像版本，每次更新版本时需要调整
+ImageVer=1.0.0
+ImageName=neutrino-proxy
+DockerFilePath=$PWD/../..
+
+#echo '打包jar...'
+sh ./server_build.sh
+#echo '打包管理后台...'
+sh ./admin_build_docker.sh
+
+# 删除老的本地镜像
+docker rmi -f $(docker images | grep $ImageName | awk '{print $3}')
+# 构建镜像
+docker build -t $ImageName:$ImageVer -t $ImageName:latest $DockerFilePath
+
@@ -8,7 +8,7 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/li
 mkdir -p /work/$NAME/heapError/

 NAME=neutrino-proxy-server
-WORK=$PWD/../deploy/server
+WORK=$PWD/../../deploy/server
 OUT=$WORK/$NAME.out
 JAR_PATH=$WORK