From a0088c113726506b3b1c74ee2411a39ab184d2be Mon Sep 17 00:00:00 2001
From: gaojun2048 <32193458+gaojun2048@users.noreply.github.com>
Date: Fri, 13 Mar 2020 13:04:33 +0800
Subject: [PATCH] fix rpmbuild and DS Ambari plugin bug (#2144)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update quick-start.md
* 更新demo的地址
* add rpm plugin
* delete the git ignore files
* 测试git ignore
* 测试ignore
* optimize the .gitignore file
* add rpm package, delete unuse copy jar action in assembly
* delete docs dir
* add rpm plugin support
* add rpm plugin support
* add rpm plugin support
* dolphinscheduler-common have not bin dir
* dolphinscheduler-common have not bin dir
* delete unuse config about assembly
* add defineSatement
* add rpm plugin support
* add rpm plugin support
* add rpm plugin support
* add rpm support
* update install dirname , make front and backend together
* update rpm name
* update rpm name
* update rpm config
* add jars excludes
* add jars excludes
* add rpm plugion
* add rpm plugion
* add rpm plugion
* add auto create /opt/soft
* The install dir can not be fixed to apache-dolphinscheduler-incubating-1.2.1 , its version is 1.2.2
* install from rpm will create a link
* the ui install thrown rpm only support jetty not nginx
* the ui install thrown rpm only support jetty not nginx
* sql目录里加上soft_version文件
* env dir need in conf dir
* remove no use module
* add module
* updaate
* rpmbuild add dolphinscheduler-service module
---
.../DOLPHIN/1.2.1/package/scripts/params.py | 2 +-
dolphinscheduler-dist/pom.xml | 53 +++++++++---------
dolphinscheduler-ui/pom.xml | 55 +++++++++++++++++++
pom.xml | 2 +-
4 files changed, 83 insertions(+), 29 deletions(-)
diff --git a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
index 230ad14565..3780f6c27e 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
+++ b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
@@ -30,7 +30,7 @@ sys.setdefaultencoding('utf-8')
config = Script.get_config()
# conf_dir = "/etc/"
-dolphin_home = "/opt/soft/apache-dolphinscheduler-incubating-1.2.1"
+dolphin_home = "/opt/soft/dolphinscheduler"
dolphin_conf_dir = dolphin_home + "/conf"
dolphin_log_dir = dolphin_home + "/logs"
dolphin_bin_dir = dolphin_home + "/bin"
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 80ddfec9b0..0ead2b9880 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -220,10 +220,7 @@
${basedir}/../dolphinscheduler-alert/src/main/resources
- **/*.properties
- **/*.xml
- **/*.json
- **/*.ftl
+ **/*.*
@@ -232,9 +229,7 @@
${basedir}/../dolphinscheduler-common/src/main/resources
- **/*.properties
- **/*.xml
- **/*.json
+ **/*.*
@@ -243,10 +238,7 @@
${basedir}/../dolphinscheduler-dao/src/main/resources
- **/*.properties
- **/*.xml
- **/*.json
- **/*.yml
+ **/*.*
@@ -255,9 +247,7 @@
${basedir}/../dolphinscheduler-api/src/main/resources
- **/*.properties
- **/*.xml
- **/*.json
+ **/*.*
@@ -266,13 +256,19 @@
${basedir}/../dolphinscheduler-server/src/main/resources
- **/*.properties
- **/*.xml
- **/*.json
config/*.*
+
+
+ ${basedir}/../dolphinscheduler-service/src/main/resources
+
+
+ *.*
+
+
+
${basedir}/../script
@@ -342,14 +338,6 @@
-
-
- ${basedir}/../dolphinscheduler-ui
-
-
- install-dolphinscheduler-ui.sh
-
-
${basedir}/release-docs
@@ -362,7 +350,7 @@
- /opt/soft/${project.build.finalName}/dist
+ /opt/soft/${project.build.finalName}/ui
755
root
root
@@ -391,6 +379,14 @@
**/*.*
+
+
+ ${basedir}/../sql
+
+
+ soft_version
+
+
@@ -405,7 +401,7 @@
${basedir}/../script
- **/*.*
+ *.sh
@@ -416,6 +412,9 @@
+
+
+
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 3fd9aa6650..78869ffbc4 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -89,6 +89,61 @@
+
+ rpmbuild
+
+
+
+ com.github.eirslett
+ frontend-maven-plugin
+ ${frontend-maven-plugin.version}
+
+
+ install node and npm
+
+ install-node-and-npm
+
+
+ ${node.version}
+ ${npm.version}
+
+
+
+ npm install node-sass --unsafe-perm
+
+ npm
+
+ generate-resources
+
+ install node-sass --unsafe-perm
+
+
+
+ npm install
+
+ npm
+
+ generate-resources
+
+ install
+
+
+
+ npm run build:release
+
+ npm
+
+
+ run build:release
+
+
+
+
+
+
+
+
+
nginx
diff --git a/pom.xml b/pom.xml
index 8b91add6d7..8910723117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,4 +885,4 @@
dolphinscheduler-service
-
+
\ No newline at end of file