seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
1.3.0-release
gaojun2048 2020-03-13 13:04:33 +08:00 committed by gaojun2048
parent 33e86a97bf
commit eebf5fa796
4 changed files with 83 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
View File

@ -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"

53
dolphinscheduler-dist/pom.xml
View File

@ -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,13 +256,19 @@
${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
@ -342,14 +338,6 @@
</includes>
</source>
<source>
<location>
${basedir}/../dolphinscheduler-ui
</location>
<includes>
<include>install-dolphinscheduler-ui.sh</include>
</includes>
</source>
<source>
<location>
${basedir}/release-docs
@ -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>

55
dolphinscheduler-ui/pom.xml
View File

@ -89,6 +89,61 @@
</build>
</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>

2
pom.xml
View File

@ -881,4 +881,4 @@
<module>dolphinscheduler-service</module>
</modules>
</project>
</project>