This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new a0088c1 fix rpmbuild and DS Ambari plugin bug (#2144)
a0088c1 is described below
commit a0088c113726506b3b1c74ee2411a39ab184d2be
Author: gaojun2048 <[email protected]>
AuthorDate: Fri Mar 13 13:04:33 2020 +0800
fix rpmbuild and DS Ambari plugin bug (#2144)
* 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 230ad14..3780f6c 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 80ddfec..0ead2b9 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -220,10 +220,7 @@
${basedir}/../dolphinscheduler-alert/src/main/resources
</location>
<includes>
-
<include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.ftl</include>
+ <include>**/*.*</include>
</includes>
</source>
@@ -232,9 +229,7 @@
${basedir}/../dolphinscheduler-common/src/main/resources
</location>
<includes>
-
<include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
+ <include>**/*.*</include>
</includes>
</source>
@@ -243,10 +238,7 @@
${basedir}/../dolphinscheduler-dao/src/main/resources
</location>
<includes>
-
<include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.yml</include>
+ <include>**/*.*</include>
</includes>
</source>
@@ -255,9 +247,7 @@
${basedir}/../dolphinscheduler-api/src/main/resources
</location>
<includes>
-
<include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
+ <include>**/*.*</include>
</includes>
</source>
@@ -266,15 +256,21 @@
${basedir}/../dolphinscheduler-server/src/main/resources
</location>
<includes>
-
<include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
<include>config/*.*</include>
</includes>
</source>
<source>
<location>
+
${basedir}/../dolphinscheduler-service/src/main/resources
+ </location>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ </source>
+
+ <source>
+ <location>
${basedir}/../script
</location>
<includes>
@@ -344,14 +340,6 @@
<source>
<location>
-
${basedir}/../dolphinscheduler-ui
- </location>
- <includes>
-
<include>install-dolphinscheduler-ui.sh</include>
- </includes>
- </source>
- <source>
- <location>
${basedir}/release-docs
</location>
<includes>
@@ -362,7 +350,7 @@
</sources>
</mapping>
<mapping>
-
<directory>/opt/soft/${project.build.finalName}/dist</directory>
+
<directory>/opt/soft/${project.build.finalName}/ui</directory>
<filemode>755</filemode>
<username>root</username>
<groupname>root</groupname>
@@ -391,6 +379,14 @@
<include>**/*.*</include>
</includes>
</source>
+ <source>
+ <location>
+ ${basedir}/../sql
+ </location>
+ <includes>
+ <include>soft_version</include>
+ </includes>
+ </source>
</sources>
</mapping>
@@ -405,7 +401,7 @@
${basedir}/../script
</location>
<includes>
- <include>**/*.*</include>
+ <include>*.sh</include>
</includes>
</source>
@@ -416,6 +412,9 @@
<preinstallScriptlet>
<script>mkdir -p /opt/soft</script>
</preinstallScriptlet>
+ <postinstallScriptlet>
+ <script>rm -rf /opt/soft/dolphinscheduler ; ln
-s /opt/soft/apache-dolphinscheduler-incubating-${project.version}
/opt/soft/dolphinscheduler</script>
+ </postinstallScriptlet>
<postremoveScriptlet>
<script>rm -rf
/opt/soft/apache-dolphinscheduler-incubating-${project.version}</script>
</postremoveScriptlet>
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 3fd9aa6..78869ff 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -90,6 +90,61 @@
</profile>
<profile>
+ <id>rpmbuild</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>${frontend-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>${npm.version}</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install node-sass --unsafe-perm</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <arguments>install node-sass --unsafe-perm</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm run build:release</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run build:release</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+ </profile>
+
+ <profile>
<id>nginx</id>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 8b91add..8910723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,4 +885,4 @@
<module>dolphinscheduler-service</module>
</modules>
-</project>
+</project>
\ No newline at end of file
