github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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
pull/3/MERGE
gaojun2048 5 years ago committed by gaojun2048
parent
33e86a97bf
commit
eebf5fa796
4 changed files with 83 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py
  2. 53
      dolphinscheduler-dist/pom.xml
  3. 55
      dolphinscheduler-ui/pom.xml

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

@ -30,7 +30,7 @@ sys.setdefaultencoding('utf-8')
config = Script.get_config() config = Script.get_config()
# conf_dir = "/etc/" # 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_conf_dir = dolphin_home + "/conf"
dolphin_log_dir = dolphin_home + "/logs" dolphin_log_dir = dolphin_home + "/logs"
dolphin_bin_dir = dolphin_home + "/bin" dolphin_bin_dir = dolphin_home + "/bin"

53
dolphinscheduler-dist/pom.xml vendored
Unescape View File

@ -220,10 +220,7 @@
${basedir}/../dolphinscheduler-alert/src/main/resources ${basedir}/../dolphinscheduler-alert/src/main/resources
</location> </location>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.*</include>
<include>**/*.xml</include>
<include>**/*.json</include>
<include>**/*.ftl</include>
</includes> </includes>
</source> </source>
@ -232,9 +229,7 @@
${basedir}/../dolphinscheduler-common/src/main/resources ${basedir}/../dolphinscheduler-common/src/main/resources
</location> </location>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.*</include>
<include>**/*.xml</include>
<include>**/*.json</include>
</includes> </includes>
</source> </source>
@ -243,10 +238,7 @@
${basedir}/../dolphinscheduler-dao/src/main/resources ${basedir}/../dolphinscheduler-dao/src/main/resources
</location> </location>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.*</include>
<include>**/*.xml</include>
<include>**/*.json</include>
<include>**/*.yml</include>
</includes> </includes>
</source> </source>
@ -255,9 +247,7 @@
${basedir}/../dolphinscheduler-api/src/main/resources ${basedir}/../dolphinscheduler-api/src/main/resources
</location> </location>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.*</include>
<include>**/*.xml</include>
<include>**/*.json</include>
</includes> </includes>
</source> </source>
@ -266,13 +256,19 @@
${basedir}/../dolphinscheduler-server/src/main/resources ${basedir}/../dolphinscheduler-server/src/main/resources
</location> </location>
<includes> <includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.json</include>
<include>config/*.*</include> <include>config/*.*</include>
</includes> </includes>
</source> </source>
<source>
<location>
${basedir}/../dolphinscheduler-service/src/main/resources
</location>
<includes>
<include>*.*</include>
</includes>
</source>
<source> <source>
<location> <location>
${basedir}/../script ${basedir}/../script
@ -342,14 +338,6 @@
</includes> </includes>
</source> </source>
<source>
<location>
${basedir}/../dolphinscheduler-ui
</location>
<includes>
<include>install-dolphinscheduler-ui.sh</include>
</includes>
</source>
<source> <source>
<location> <location>
${basedir}/release-docs ${basedir}/release-docs
@ -362,7 +350,7 @@
</sources> </sources>
</mapping> </mapping>
<mapping> <mapping>
<directory>/opt/soft/${project.build.finalName}/dist</directory> <directory>/opt/soft/${project.build.finalName}/ui</directory>
<filemode>755</filemode> <filemode>755</filemode>
<username>root</username> <username>root</username>
<groupname>root</groupname> <groupname>root</groupname>
@ -391,6 +379,14 @@
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
</source> </source>
<source>
<location>
${basedir}/../sql
</location>
<includes>
<include>soft_version</include>
</includes>
</source>
</sources> </sources>
</mapping> </mapping>
@ -405,7 +401,7 @@
${basedir}/../script ${basedir}/../script
</location> </location>
<includes> <includes>
<include>**/*.*</include> <include>*.sh</include>
</includes> </includes>
</source> </source>
@ -416,6 +412,9 @@
<preinstallScriptlet> <preinstallScriptlet>
<script>mkdir -p /opt/soft</script> <script>mkdir -p /opt/soft</script>
</preinstallScriptlet> </preinstallScriptlet>
<postinstallScriptlet>
<script>rm -rf /opt/soft/dolphinscheduler ; ln -s /opt/soft/apache-dolphinscheduler-incubating-${project.version} /opt/soft/dolphinscheduler</script>
</postinstallScriptlet>
<postremoveScriptlet> <postremoveScriptlet>
<script>rm -rf /opt/soft/apache-dolphinscheduler-incubating-${project.version}</script> <script>rm -rf /opt/soft/apache-dolphinscheduler-incubating-${project.version}</script>
</postremoveScriptlet> </postremoveScriptlet>

55
dolphinscheduler-ui/pom.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save