diff --git a/neutrino-proxy-client/pom.xml b/neutrino-proxy-client/pom.xml index c8ae481f..f624979f 100644 --- a/neutrino-proxy-client/pom.xml +++ b/neutrino-proxy-client/pom.xml @@ -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"> - neutrino-proxy-parent + neutrino-proxy org.dromara.neutrino-proxy ${revision} ../pom.xml diff --git a/neutrino-proxy-core/pom.xml b/neutrino-proxy-core/pom.xml index b13b8acf..ce649a9d 100644 --- a/neutrino-proxy-core/pom.xml +++ b/neutrino-proxy-core/pom.xml @@ -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"> - neutrino-proxy-parent + neutrino-proxy org.dromara.neutrino-proxy ${revision} ../pom.xml diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index 615994de..87c4110e 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -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"> - neutrino-proxy-parent + neutrino-proxy org.dromara.neutrino-proxy ${revision} ../pom.xml diff --git a/pom.xml b/pom.xml index 79d40881..05cd8558 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.dromara.neutrino-proxy - neutrino-proxy-parent + neutrino-proxy pom ${revision} diff --git a/bin/admin_build_dev.sh b/scripts/unix/admin_build_dev.sh similarity index 99% rename from bin/admin_build_dev.sh rename to scripts/unix/admin_build_dev.sh index 5f612b78..93b0cd1e 100644 --- a/bin/admin_build_dev.sh +++ b/scripts/unix/admin_build_dev.sh @@ -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 diff --git a/bin/admin_build_docker.sh b/scripts/unix/admin_build_docker.sh similarity index 99% rename from bin/admin_build_docker.sh rename to scripts/unix/admin_build_docker.sh index 44f5d63d..f7080937 100644 --- a/bin/admin_build_docker.sh +++ b/scripts/unix/admin_build_docker.sh @@ -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 diff --git a/bin/client_build.sh b/scripts/unix/client_build.sh similarity index 98% rename from bin/client_build.sh rename to scripts/unix/client_build.sh index d7e2312e..00322c10 100644 --- a/bin/client_build.sh +++ b/scripts/unix/client_build.sh @@ -9,7 +9,7 @@ deployDir="deploy" clientDeployDir=$deployDir"/client" #切到项目根目录 -cd .. +cd ../.. #初始化文件夹 if [ ! -d "$deployDir" ];then mkdir $deployDir diff --git a/bin/client_start.sh b/scripts/unix/client_start.sh similarity index 97% rename from bin/client_start.sh rename to scripts/unix/client_start.sh index 457cb0c2..9ccb4682 100755 --- a/bin/client_start.sh +++ b/scripts/unix/client_start.sh @@ -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 diff --git a/bin/server_build.sh b/scripts/unix/server_build.sh similarity index 98% rename from bin/server_build.sh rename to scripts/unix/server_build.sh index 875e8ff9..cbf2ce92 100644 --- a/bin/server_build.sh +++ b/scripts/unix/server_build.sh @@ -9,7 +9,7 @@ deployDir="deploy" serverDeployDir=$deployDir"/server" #切到项目根目录 -cd .. +cd ../.. #初始化文件夹 if [ ! -d "$deployDir" ];then mkdir $deployDir diff --git a/scripts/unix/server_docker_build.sh b/scripts/unix/server_docker_build.sh new file mode 100644 index 00000000..364b0873 --- /dev/null +++ b/scripts/unix/server_docker_build.sh @@ -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 + diff --git a/bin/server_start.sh b/scripts/unix/server_start.sh similarity index 97% rename from bin/server_start.sh rename to scripts/unix/server_start.sh index 270eede7..bae06ed3 100755 --- a/bin/server_start.sh +++ b/scripts/unix/server_start.sh @@ -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 diff --git a/bin/admin_build_dev.bat b/scripts/win/admin_build_dev.bat similarity index 100% rename from bin/admin_build_dev.bat rename to scripts/win/admin_build_dev.bat diff --git a/bin/admin_build_docker.bat b/scripts/win/admin_build_docker.bat similarity index 100% rename from bin/admin_build_docker.bat rename to scripts/win/admin_build_docker.bat diff --git a/bin/client_build.bat b/scripts/win/client_build.bat similarity index 100% rename from bin/client_build.bat rename to scripts/win/client_build.bat diff --git a/bin/client_start.bat b/scripts/win/client_start.bat similarity index 100% rename from bin/client_start.bat rename to scripts/win/client_start.bat diff --git a/bin/server_build.bat b/scripts/win/server_build.bat similarity index 100% rename from bin/server_build.bat rename to scripts/win/server_build.bat diff --git a/bin/server_start.bat b/scripts/win/server_start.bat similarity index 100% rename from bin/server_start.bat rename to scripts/win/server_start.bat