Merge pull request #1 from apache/dev-db

Dev db

.gitignore

@@ -35,112 +35,112 @@ config.gypi
 test/coverage
 /docs/zh_CN/介绍
 /docs/zh_CN/贡献代码.md
-/escheduler-common/src/main/resources/zookeeper.properties
-escheduler-alert/logs/
-escheduler-alert/src/main/resources/alert.properties_bak
-escheduler-alert/src/main/resources/logback.xml
-escheduler-server/src/main/resources/logback.xml
-escheduler-ui/dist/css/common.16ac5d9.css
-escheduler-ui/dist/css/home/index.b444b91.css
-escheduler-ui/dist/css/login/index.5866c64.css
-escheduler-ui/dist/js/0.ac94e5d.js
-escheduler-ui/dist/js/0.ac94e5d.js.map
-escheduler-ui/dist/js/1.0b043a3.js
-escheduler-ui/dist/js/1.0b043a3.js.map
-escheduler-ui/dist/js/10.1bce3dc.js
-escheduler-ui/dist/js/10.1bce3dc.js.map
-escheduler-ui/dist/js/11.79f04d8.js
-escheduler-ui/dist/js/11.79f04d8.js.map
-escheduler-ui/dist/js/12.420daa5.js
-escheduler-ui/dist/js/12.420daa5.js.map
-escheduler-ui/dist/js/13.e5bae1c.js
-escheduler-ui/dist/js/13.e5bae1c.js.map
-escheduler-ui/dist/js/14.f2a0dca.js
-escheduler-ui/dist/js/14.f2a0dca.js.map
-escheduler-ui/dist/js/15.45373e8.js
-escheduler-ui/dist/js/15.45373e8.js.map
-escheduler-ui/dist/js/16.fecb0fc.js
-escheduler-ui/dist/js/16.fecb0fc.js.map
-escheduler-ui/dist/js/17.84be279.js
-escheduler-ui/dist/js/17.84be279.js.map
-escheduler-ui/dist/js/18.307ea70.js
-escheduler-ui/dist/js/18.307ea70.js.map
-escheduler-ui/dist/js/19.144db9c.js
-escheduler-ui/dist/js/19.144db9c.js.map
-escheduler-ui/dist/js/2.8b4ef29.js
-escheduler-ui/dist/js/2.8b4ef29.js.map
-escheduler-ui/dist/js/20.4c527e9.js
-escheduler-ui/dist/js/20.4c527e9.js.map
-escheduler-ui/dist/js/21.831b2a2.js
-escheduler-ui/dist/js/21.831b2a2.js.map
-escheduler-ui/dist/js/22.2b4bb2a.js
-escheduler-ui/dist/js/22.2b4bb2a.js.map
-escheduler-ui/dist/js/23.81467ef.js
-escheduler-ui/dist/js/23.81467ef.js.map
-escheduler-ui/dist/js/24.54a00e4.js
-escheduler-ui/dist/js/24.54a00e4.js.map
-escheduler-ui/dist/js/25.8d7bd36.js
-escheduler-ui/dist/js/25.8d7bd36.js.map
-escheduler-ui/dist/js/26.2ec5e78.js
-escheduler-ui/dist/js/26.2ec5e78.js.map
-escheduler-ui/dist/js/27.3ab48c2.js
-escheduler-ui/dist/js/27.3ab48c2.js.map
-escheduler-ui/dist/js/28.363088a.js
-escheduler-ui/dist/js/28.363088a.js.map
-escheduler-ui/dist/js/29.6c5853a.js
-escheduler-ui/dist/js/29.6c5853a.js.map
-escheduler-ui/dist/js/3.a0edb5b.js
-escheduler-ui/dist/js/3.a0edb5b.js.map
-escheduler-ui/dist/js/30.940fdd3.js
-escheduler-ui/dist/js/30.940fdd3.js.map
-escheduler-ui/dist/js/31.168a460.js
-escheduler-ui/dist/js/31.168a460.js.map
-escheduler-ui/dist/js/32.8df6594.js
-escheduler-ui/dist/js/32.8df6594.js.map
-escheduler-ui/dist/js/33.4480bbe.js
-escheduler-ui/dist/js/33.4480bbe.js.map
-escheduler-ui/dist/js/34.b407fe1.js
-escheduler-ui/dist/js/34.b407fe1.js.map
-escheduler-ui/dist/js/35.f340b0a.js
-escheduler-ui/dist/js/35.f340b0a.js.map
-escheduler-ui/dist/js/36.8880c2d.js
-escheduler-ui/dist/js/36.8880c2d.js.map
-escheduler-ui/dist/js/37.ea2a25d.js
-escheduler-ui/dist/js/37.ea2a25d.js.map
-escheduler-ui/dist/js/38.98a59ee.js
-escheduler-ui/dist/js/38.98a59ee.js.map
-escheduler-ui/dist/js/39.a5e958a.js
-escheduler-ui/dist/js/39.a5e958a.js.map
-escheduler-ui/dist/js/4.4ca44db.js
-escheduler-ui/dist/js/4.4ca44db.js.map
-escheduler-ui/dist/js/40.e187b1e.js
-escheduler-ui/dist/js/40.e187b1e.js.map
-escheduler-ui/dist/js/41.0e89182.js
-escheduler-ui/dist/js/41.0e89182.js.map
-escheduler-ui/dist/js/42.341047c.js
-escheduler-ui/dist/js/42.341047c.js.map
-escheduler-ui/dist/js/43.27b8228.js
-escheduler-ui/dist/js/43.27b8228.js.map
-escheduler-ui/dist/js/44.e8869bc.js
-escheduler-ui/dist/js/44.e8869bc.js.map
-escheduler-ui/dist/js/45.8d54901.js
-escheduler-ui/dist/js/45.8d54901.js.map
-escheduler-ui/dist/js/5.e1ed7f3.js
-escheduler-ui/dist/js/5.e1ed7f3.js.map
-escheduler-ui/dist/js/6.241ba07.js
-escheduler-ui/dist/js/6.241ba07.js.map
-escheduler-ui/dist/js/7.ab2e297.js
-escheduler-ui/dist/js/7.ab2e297.js.map
-escheduler-ui/dist/js/8.83ff814.js
-escheduler-ui/dist/js/8.83ff814.js.map
-escheduler-ui/dist/js/9.39cb29f.js
-escheduler-ui/dist/js/9.39cb29f.js.map
-escheduler-ui/dist/js/common.733e342.js
-escheduler-ui/dist/js/common.733e342.js.map
-escheduler-ui/dist/js/home/index.78a5d12.js
-escheduler-ui/dist/js/home/index.78a5d12.js.map
-escheduler-ui/dist/js/login/index.291b8e3.js
-escheduler-ui/dist/js/login/index.291b8e3.js.map
-escheduler-ui/dist/lib/external/
-escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
-/escheduler-dao/src/main/resources/dao/data_source.properties
+/dolphinscheduler-common/src/main/resources/zookeeper.properties
+dolphinscheduler-alert/logs/
+dolphinscheduler-alert/src/main/resources/alert.properties_bak
+dolphinscheduler-alert/src/main/resources/logback.xml
+dolphinscheduler-server/src/main/resources/logback.xml
+dolphinscheduler-ui/dist/css/common.16ac5d9.css
+dolphinscheduler-ui/dist/css/home/index.b444b91.css
+dolphinscheduler-ui/dist/css/login/index.5866c64.css
+dolphinscheduler-ui/dist/js/0.ac94e5d.js
+dolphinscheduler-ui/dist/js/0.ac94e5d.js.map
+dolphinscheduler-ui/dist/js/1.0b043a3.js
+dolphinscheduler-ui/dist/js/1.0b043a3.js.map
+dolphinscheduler-ui/dist/js/10.1bce3dc.js
+dolphinscheduler-ui/dist/js/10.1bce3dc.js.map
+dolphinscheduler-ui/dist/js/11.79f04d8.js
+dolphinscheduler-ui/dist/js/11.79f04d8.js.map
+dolphinscheduler-ui/dist/js/12.420daa5.js
+dolphinscheduler-ui/dist/js/12.420daa5.js.map
+dolphinscheduler-ui/dist/js/13.e5bae1c.js
+dolphinscheduler-ui/dist/js/13.e5bae1c.js.map
+dolphinscheduler-ui/dist/js/14.f2a0dca.js
+dolphinscheduler-ui/dist/js/14.f2a0dca.js.map
+dolphinscheduler-ui/dist/js/15.45373e8.js
+dolphinscheduler-ui/dist/js/15.45373e8.js.map
+dolphinscheduler-ui/dist/js/16.fecb0fc.js
+dolphinscheduler-ui/dist/js/16.fecb0fc.js.map
+dolphinscheduler-ui/dist/js/17.84be279.js
+dolphinscheduler-ui/dist/js/17.84be279.js.map
+dolphinscheduler-ui/dist/js/18.307ea70.js
+dolphinscheduler-ui/dist/js/18.307ea70.js.map
+dolphinscheduler-ui/dist/js/19.144db9c.js
+dolphinscheduler-ui/dist/js/19.144db9c.js.map
+dolphinscheduler-ui/dist/js/2.8b4ef29.js
+dolphinscheduler-ui/dist/js/2.8b4ef29.js.map
+dolphinscheduler-ui/dist/js/20.4c527e9.js
+dolphinscheduler-ui/dist/js/20.4c527e9.js.map
+dolphinscheduler-ui/dist/js/21.831b2a2.js
+dolphinscheduler-ui/dist/js/21.831b2a2.js.map
+dolphinscheduler-ui/dist/js/22.2b4bb2a.js
+dolphinscheduler-ui/dist/js/22.2b4bb2a.js.map
+dolphinscheduler-ui/dist/js/23.81467ef.js
+dolphinscheduler-ui/dist/js/23.81467ef.js.map
+dolphinscheduler-ui/dist/js/24.54a00e4.js
+dolphinscheduler-ui/dist/js/24.54a00e4.js.map
+dolphinscheduler-ui/dist/js/25.8d7bd36.js
+dolphinscheduler-ui/dist/js/25.8d7bd36.js.map
+dolphinscheduler-ui/dist/js/26.2ec5e78.js
+dolphinscheduler-ui/dist/js/26.2ec5e78.js.map
+dolphinscheduler-ui/dist/js/27.3ab48c2.js
+dolphinscheduler-ui/dist/js/27.3ab48c2.js.map
+dolphinscheduler-ui/dist/js/28.363088a.js
+dolphinscheduler-ui/dist/js/28.363088a.js.map
+dolphinscheduler-ui/dist/js/29.6c5853a.js
+dolphinscheduler-ui/dist/js/29.6c5853a.js.map
+dolphinscheduler-ui/dist/js/3.a0edb5b.js
+dolphinscheduler-ui/dist/js/3.a0edb5b.js.map
+dolphinscheduler-ui/dist/js/30.940fdd3.js
+dolphinscheduler-ui/dist/js/30.940fdd3.js.map
+dolphinscheduler-ui/dist/js/31.168a460.js
+dolphinscheduler-ui/dist/js/31.168a460.js.map
+dolphinscheduler-ui/dist/js/32.8df6594.js
+dolphinscheduler-ui/dist/js/32.8df6594.js.map
+dolphinscheduler-ui/dist/js/33.4480bbe.js
+dolphinscheduler-ui/dist/js/33.4480bbe.js.map
+dolphinscheduler-ui/dist/js/34.b407fe1.js
+dolphinscheduler-ui/dist/js/34.b407fe1.js.map
+dolphinscheduler-ui/dist/js/35.f340b0a.js
+dolphinscheduler-ui/dist/js/35.f340b0a.js.map
+dolphinscheduler-ui/dist/js/36.8880c2d.js
+dolphinscheduler-ui/dist/js/36.8880c2d.js.map
+dolphinscheduler-ui/dist/js/37.ea2a25d.js
+dolphinscheduler-ui/dist/js/37.ea2a25d.js.map
+dolphinscheduler-ui/dist/js/38.98a59ee.js
+dolphinscheduler-ui/dist/js/38.98a59ee.js.map
+dolphinscheduler-ui/dist/js/39.a5e958a.js
+dolphinscheduler-ui/dist/js/39.a5e958a.js.map
+dolphinscheduler-ui/dist/js/4.4ca44db.js
+dolphinscheduler-ui/dist/js/4.4ca44db.js.map
+dolphinscheduler-ui/dist/js/40.e187b1e.js
+dolphinscheduler-ui/dist/js/40.e187b1e.js.map
+dolphinscheduler-ui/dist/js/41.0e89182.js
+dolphinscheduler-ui/dist/js/41.0e89182.js.map
+dolphinscheduler-ui/dist/js/42.341047c.js
+dolphinscheduler-ui/dist/js/42.341047c.js.map
+dolphinscheduler-ui/dist/js/43.27b8228.js
+dolphinscheduler-ui/dist/js/43.27b8228.js.map
+dolphinscheduler-ui/dist/js/44.e8869bc.js
+dolphinscheduler-ui/dist/js/44.e8869bc.js.map
+dolphinscheduler-ui/dist/js/45.8d54901.js
+dolphinscheduler-ui/dist/js/45.8d54901.js.map
+dolphinscheduler-ui/dist/js/5.e1ed7f3.js
+dolphinscheduler-ui/dist/js/5.e1ed7f3.js.map
+dolphinscheduler-ui/dist/js/6.241ba07.js
+dolphinscheduler-ui/dist/js/6.241ba07.js.map
+dolphinscheduler-ui/dist/js/7.ab2e297.js
+dolphinscheduler-ui/dist/js/7.ab2e297.js.map
+dolphinscheduler-ui/dist/js/8.83ff814.js
+dolphinscheduler-ui/dist/js/8.83ff814.js.map
+dolphinscheduler-ui/dist/js/9.39cb29f.js
+dolphinscheduler-ui/dist/js/9.39cb29f.js.map
+dolphinscheduler-ui/dist/js/common.733e342.js
+dolphinscheduler-ui/dist/js/common.733e342.js.map
+dolphinscheduler-ui/dist/js/home/index.78a5d12.js
+dolphinscheduler-ui/dist/js/home/index.78a5d12.js.map
+dolphinscheduler-ui/dist/js/login/index.291b8e3.js
+dolphinscheduler-ui/dist/js/login/index.291b8e3.js.map
+dolphinscheduler-ui/dist/lib/external/
+dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+/dolphinscheduler-dao/src/main/resources/dao/data_source.properties

dockerfile/Dockerfile

@@ -37,7 +37,7 @@ RUN cd /opt && \
     mkdir -p /tmp/zookeeper && \
     rm -rf /opt/zookeeper/conf/zoo_sample.cfg
 
-ADD ./conf/zookeeper/zoo.cfg /opt/zookeeper/conf
+ADD ./dockerfile/conf/zookeeper/zoo.cfg /opt/zookeeper/conf
 ENV ZK_HOME=/opt/zookeeper
 ENV PATH $PATH:$ZK_HOME/bin
 
@@ -48,7 +48,7 @@ RUN cd /opt && \
     mv apache-maven-3.3.9 maven && \
     rm -rf ./apache-maven-*tar.gz && \
     rm -rf /opt/maven/conf/settings.xml
-ADD ./conf/maven/settings.xml /opt/maven/conf
+ADD ./dockerfile/conf/maven/settings.xml /opt/maven/conf
 ENV MAVEN_HOME=/opt/maven
 ENV PATH $PATH:$MAVEN_HOME/bin
 
@@ -61,21 +61,16 @@ RUN cd /opt && \
 ENV NODE_HOME=/opt/node
 ENV PATH $PATH:$NODE_HOME/bin
 
-#5,下载escheduler
-RUN cd /opt && \
-    wget https://github.com/analysys/EasyScheduler/archive/${version}.tar.gz && \
-    tar -zxvf ${version}.tar.gz && \
-    mv EasyScheduler-${version} easyscheduler_source && \
-    rm -rf ./${version}.tar.gz
+ADD . /opt/easyscheduler_source
 
 #6,后端编译
 RUN cd /opt/easyscheduler_source && \
     mvn -U clean package assembly:assembly -Dmaven.test.skip=true
 
 #7,前端编译
-RUN chmod -R 777 /opt/easyscheduler_source/escheduler-ui && \
-    cd /opt/easyscheduler_source/escheduler-ui && \
-    rm -rf /opt/easyscheduler_source/escheduler-ui/node_modules && \
+RUN chmod -R 777 /opt/easyscheduler_source/dolphinscheduler-ui && \
+    cd /opt/easyscheduler_source/dolphinscheduler-ui && \
+    rm -rf /opt/easyscheduler_source/dolphinscheduler-ui/node_modules && \
     npm install node-sass --unsafe-perm && \
     npm install && \
     npm run build
@@ -109,14 +104,14 @@ RUN apt-get update && \
   echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
   chown -R www-data:www-data /var/lib/nginx
 
-#10,修改escheduler配置文件
+#10,修改dolphinscheduler配置文件
 #后端配置
-RUN mkdir -p /opt/escheduler && \
-    tar -zxvf /opt/easyscheduler_source/target/escheduler-${tar_version}.tar.gz -C /opt/escheduler && \
-    rm -rf /opt/escheduler/conf
-ADD ./conf/escheduler/conf /opt/escheduler/conf
+RUN mkdir -p /opt/dolphinscheduler && \
+    tar -zxvf /opt/easyscheduler_source/target/dolphinscheduler-${tar_version}.tar.gz -C /opt/dolphinscheduler && \
+    rm -rf /opt/dolphinscheduler/conf
+ADD ./dockerfile/conf/dolphinscheduler/conf /opt/dolphinscheduler/conf
 #前端nginx配置
-ADD ./conf/nginx/default.conf /etc/nginx/conf.d
+ADD ./dockerfile/conf/nginx/default.conf /etc/nginx/conf.d
 
 #11,开放端口
 EXPOSE 2181 2888 3888 3306 80 12345 8888
@@ -132,12 +127,12 @@ RUN apt-get update && \
   apt-get -y install python-pip && \
   pip install kazoo
 
-COPY ./startup.sh /root/startup.sh
+COPY ./dockerfile/startup.sh /root/startup.sh
 #13,修改权限和设置软连
 RUN chmod +x /root/startup.sh && \
-  chmod +x /opt/escheduler/script/create_escheduler.sh && \
+  chmod +x /opt/dolphinscheduler/script/create-dolphinscheduler.sh && \
   chmod +x /opt/zookeeper/bin/zkServer.sh && \
-  chmod +x /opt/escheduler/bin/escheduler-daemon.sh && \
+  chmod +x /opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh && \
   rm -rf /bin/sh && \
   ln -s /bin/bash /bin/sh && \
   mkdir -p /tmp/xls

dockerfile/README.md

@@ -0,0 +1,11 @@
+## Build Image
+```
+  cd ..
+  docker build -t dolphinscheduler --build-arg version=1.1.0 --build-arg tar_version=1.1.0-SNAPSHOT -f dockerfile/Dockerfile .
+  docker run -p 12345:12345 -p 8888:8888 --rm --name dolphinscheduler -d dolphinscheduler
+```
+* Visit the url: http://127.0.0.1:8888
+* UserName:admin Password:dolphinscheduler123
+
+## Note
+* MacOS: The memory of docker needs to be set to 4G, default 2G. Steps: Preferences -> Advanced -> adjust resources -> Apply & Restart

dockerfile/conf/escheduler/conf/alert.properties → dockerfile/conf/dolphinscheduler/conf/alert.properties

@@ -6,12 +6,13 @@ mail.protocol=SMTP
 mail.server.host=smtp.office365.com
 mail.server.port=587
 mail.sender=qiaozhanwei@outlook.com
-mail.passwd=eschedulerBJEG
+mail.passwd=dolphinschedulerBJEG
 
 # TLS
 mail.smtp.starttls.enable=true
 # SSL
 mail.smtp.ssl.enable=false
+mail.smtp.ssl.trust=qiaozhanwei@outlook.com
 
 #xls file path,need create if not exist
 xls.file.path=/tmp/xls

dockerfile/conf/escheduler/conf/alert_logback.xml → dockerfile/conf/dolphinscheduler/conf/alert_logback.xml

@@ -11,9 +11,9 @@
 	</appender>
 
 	<appender name="ALERTLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.base}/escheduler-alert.log</file>
+		<file>${log.base}/dolphinscheduler-alert.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.base}/escheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+			<fileNamePattern>${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
 			<maxHistory>20</maxHistory>
 			<maxFileSize>64MB</maxFileSize>
 		</rollingPolicy>

dockerfile/conf/escheduler/conf/apiserver_logback.xml → dockerfile/conf/dolphinscheduler/conf/apiserver_logback.xml

@@ -20,9 +20,9 @@
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>INFO</level>
 		</filter>
-        <file>${log.base}/escheduler-api-server.log</file>
+        <file>${log.base}/dolphinscheduler-api-server.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.base}/escheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+			<fileNamePattern>${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
 			<maxHistory>168</maxHistory>
 			<maxFileSize>64MB</maxFileSize>
 		</rollingPolicy>