From 17cb9ea62684e46c2847729fa3bd7a595c7f3f88 Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 7 Mar 2021 18:04:56 +0800 Subject: [PATCH] chore: upgrade deployment script --- README.md | 8 ++++---- others/script/build_docker.sh | 2 +- others/script/jenkins_auto_build.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1f173b5c..e00e826b 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,6 @@ Refer to [PowerJob Introduction](https://www.yuque.com/powerjob/en/introduce) fo **[中文文档](https://www.yuque.com/powerjob/guidence/intro)** -## Stargazers over time - -[![Stargazers over time](https://starchart.cc/PowerJob/PowerJob.svg)](https://starchart.cc/PowerJob/PowerJob) - # Known Users [Click to register as PowerJob user!](https://github.com/PowerJob/PowerJob/issues/6) ღ( ´・ᴗ・\` )ღ Many thanks to the following registered users. ღ( ´・ᴗ・\` )ღ @@ -60,6 +56,10 @@ Refer to [PowerJob Introduction](https://www.yuque.com/powerjob/en/introduce) fo PowerJob User

+# Stargazers over time + +[![Stargazers over time](https://starchart.cc/PowerJob/PowerJob.svg)](https://starchart.cc/PowerJob/PowerJob) + # License PowerJob is released under Apache License 2.0. Please refer to [License](./LICENSE) for details. diff --git a/others/script/build_docker.sh b/others/script/build_docker.sh index d245a8dc..99deabf8 100755 --- a/others/script/build_docker.sh +++ b/others/script/build_docker.sh @@ -14,7 +14,7 @@ if [ "$needmvn" = "y" ] || [ "$needmvn" = "Y" ]; then # -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件 mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am echo "================== 拷贝 jar ==================" - /bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar + /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar ls -l powerjob-server/docker/powerjob-server.jar ls -l powerjob-worker-agent/powerjob-agent.jar diff --git a/others/script/jenkins_auto_build.sh b/others/script/jenkins_auto_build.sh index 31dedf78..f0264770 100755 --- a/others/script/jenkins_auto_build.sh +++ b/others/script/jenkins_auto_build.sh @@ -3,7 +3,7 @@ cd `dirname $0`/../.. || exit echo "================== 构建 jar ==================" mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am echo "================== 拷贝 jar ==================" -/bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar +/bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar echo "================== 关闭老应用 ==================" docker stop powerjob-server @@ -26,7 +26,7 @@ docker run -d \ --name powerjob-server \ -p 7700:7700 -p 10086:10086 -p 5001:5005 -p 10001:10000 \ -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \ - -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-product" \ + -e PARAMS="--oms.swagger.enable=true --spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-product" \ -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ tjqq/powerjob-server:latest sleep 60