diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile index d194fd7bdb24dea5e06a45a08b499eac88eaf3d5..607a358e783dcb88e53740aa32ca4b5b9517f9ec 100644 --- a/dockerfile/Dockerfile +++ b/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 diff --git a/dockerfile/README.md b/dockerfile/README.md new file mode 100644 index 0000000000000000000000000000000000000000..33b58cacde257a0420e7ba23fc35bfebee5aa575 --- /dev/null +++ b/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 diff --git a/dockerfile/conf/escheduler/conf/alert.properties b/dockerfile/conf/dolphinscheduler/conf/alert.properties similarity index 92% rename from dockerfile/conf/escheduler/conf/alert.properties rename to dockerfile/conf/dolphinscheduler/conf/alert.properties index df7d8372d759d177a2ae3f33ee47c9a435b144cc..83acc686eec82e84674e70d6fbf324025e53543e 100644 --- a/dockerfile/conf/escheduler/conf/alert.properties +++ b/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 diff --git a/dockerfile/conf/escheduler/conf/alert_logback.xml b/dockerfile/conf/dolphinscheduler/conf/alert_logback.xml similarity index 84% rename from dockerfile/conf/escheduler/conf/alert_logback.xml rename to dockerfile/conf/dolphinscheduler/conf/alert_logback.xml index c4ca8e9d1fed3ea581b6d6059d6513d4cdf71345..2b617817e09e5c243fb9c566246d3d702352e921 100644 --- a/dockerfile/conf/escheduler/conf/alert_logback.xml +++ b/dockerfile/conf/dolphinscheduler/conf/alert_logback.xml @@ -11,9 +11,9 @@ - ${log.base}/escheduler-alert.log + ${log.base}/dolphinscheduler-alert.log - ${log.base}/escheduler-alert.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log 20 64MB diff --git a/dockerfile/conf/escheduler/conf/apiserver_logback.xml b/dockerfile/conf/dolphinscheduler/conf/apiserver_logback.xml similarity index 86% rename from dockerfile/conf/escheduler/conf/apiserver_logback.xml rename to dockerfile/conf/dolphinscheduler/conf/apiserver_logback.xml index 43e6af951a8fdb88e225d7a8039c803ed6a190ba..0d27889a6599720a7db650baedc3896f3c8546aa 100644 --- a/dockerfile/conf/escheduler/conf/apiserver_logback.xml +++ b/dockerfile/conf/dolphinscheduler/conf/apiserver_logback.xml @@ -20,9 +20,9 @@ INFO - ${log.base}/escheduler-api-server.log + ${log.base}/dolphinscheduler-api-server.log - ${log.base}/escheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log 168 64MB diff --git a/dockerfile/conf/escheduler/conf/application.properties b/dockerfile/conf/dolphinscheduler/conf/application.properties similarity index 90% rename from dockerfile/conf/escheduler/conf/application.properties rename to dockerfile/conf/dolphinscheduler/conf/application.properties index b817c18a4adecef1da4c915061ed11784a69b53b..f956326cc5f34c0e6eaf0e0b974534e4734d2f7d 100644 --- a/dockerfile/conf/escheduler/conf/application.properties +++ b/dockerfile/conf/dolphinscheduler/conf/application.properties @@ -4,7 +4,7 @@ server.port=12345 # session config server.servlet.session.timeout=7200 -server.servlet.context-path=/escheduler/ +server.servlet.context-path=/dolphinscheduler/ # file size limit for upload spring.servlet.multipart.max-file-size=1024MB diff --git a/dockerfile/conf/dolphinscheduler/conf/application.yml b/dockerfile/conf/dolphinscheduler/conf/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..9004f37934bd76a895a89fe99957341eb46e7c32 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/application.yml @@ -0,0 +1,91 @@ +# mysql +spring: + + datasource: + url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 + username: root + password: root@123 + # + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + initialSize: 5 + minIdle: 5 + maxActive: 20 + maxWait: 60000 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxPoolPreparedStatementPerConnectionSize: 20 + spring.datasource.filters: stat,wall,log4j + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + +# jpa: +# hibernate: +# ddl-auto : update +# datasource: +# platform: +# continue-on-error: true +# druid: +# driver-class-name: org.postgresql.Driver +# url: jdbc:postgresql://192.168.220.154:5432/escheduler + + + +#mybatis +mybatis-plus: + mapper-locations: classpath*:/org.apache.dolphinscheduler.dao.mapper/*.xml + typeEnumsPackage: org.apache.dolphinscheduler.*.enums + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: org.apache.dolphinscheduler.dao.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: AUTO + #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" + field-strategy: NOT_NULL + #驼峰下划线转换 + column-underline: true + logic-delete-value: -1 + logic-not-delete-value: 0 + banner: false + #原生配置 + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + + +# Logger Config +logging: + level: + org.apache.dolphinscheduler.dao: debug + +--- +# master settings +spring: + profiles: master + +server: + port: 5566 + +--- +# worker settings +spring: + profiles: worker + +server: + port: 7788 + +--- +# alert settings +spring: + profiles: alert + +server: + port: 7789 \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/application_alert.properties b/dockerfile/conf/dolphinscheduler/conf/application_alert.properties new file mode 100644 index 0000000000000000000000000000000000000000..cbc81b06e63ea1e50020350afb9da4effafc234d --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/application_alert.properties @@ -0,0 +1,5 @@ +logging.config=classpath:alert_logback.xml + +# server port +server.port=7789 + diff --git a/dockerfile/conf/escheduler/conf/application_master.properties b/dockerfile/conf/dolphinscheduler/conf/application_master.properties similarity index 57% rename from dockerfile/conf/escheduler/conf/application_master.properties rename to dockerfile/conf/dolphinscheduler/conf/application_master.properties index cc4774ae94907fad28e3f3c2f69c0006dc833b5d..68fe3dd02c1423c4b11e05d0807076b3a77f8fd8 100644 --- a/dockerfile/conf/escheduler/conf/application_master.properties +++ b/dockerfile/conf/dolphinscheduler/conf/application_master.properties @@ -1 +1,4 @@ logging.config=classpath:master_logback.xml + +# server port +server.port=5566 diff --git a/dockerfile/conf/dolphinscheduler/conf/application_worker.properties b/dockerfile/conf/dolphinscheduler/conf/application_worker.properties new file mode 100644 index 0000000000000000000000000000000000000000..b7e3c88b24f26af6404893038d502fc7c0cc431a --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/application_worker.properties @@ -0,0 +1,4 @@ +logging.config=classpath:worker_logback.xml + +# server port +server.port=7788 diff --git a/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml b/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml new file mode 100644 index 0000000000000000000000000000000000000000..0a5bd7ee2409adfbf0a646f4e196bbab0674d5c1 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml @@ -0,0 +1,62 @@ + + + + + + + %highlight([%level]) %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{10}:[%line] - %msg%n + + UTF-8 + + + + + INFO + + + + taskAppId + ${log.base} + + + + ${log.base}/${taskAppId}.log + + + [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n + + UTF-8 + + true + + + + + + ${log.base}/dolphinscheduler-combined.log + + INFO + + + + ${log.base}/dolphinscheduler-combined.%d{yyyy-MM-dd_HH}.%i.log + 168 + 200MB + + 　　　　　 + + + [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n + + UTF-8 + + 　　 + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/escheduler/conf/common/common.properties b/dockerfile/conf/dolphinscheduler/conf/common/common.properties similarity index 77% rename from dockerfile/conf/escheduler/conf/common/common.properties rename to dockerfile/conf/dolphinscheduler/conf/common/common.properties index 15af2845972fc1b523e9bcfc416f543fd35c64ff..f990cd1d7d6fd86cc67afad3f8967f44881c1035 100644 --- a/dockerfile/conf/escheduler/conf/common/common.properties +++ b/dockerfile/conf/dolphinscheduler/conf/common/common.properties @@ -1,20 +1,20 @@ #task queue implementation, default "zookeeper" -escheduler.queue.impl=zookeeper +dolphinscheduler.queue.impl=zookeeper # user data directory path, self configuration, please make sure the directory exists and have read write permissions -data.basedir.path=/tmp/escheduler +data.basedir.path=/tmp/dolphinscheduler # directory path for user data download. self configuration, please make sure the directory exists and have read write permissions -data.download.basedir.path=/tmp/escheduler/download +data.download.basedir.path=/tmp/dolphinscheduler/download # process execute directory. self configuration, please make sure the directory exists and have read write permissions -process.exec.basepath=/tmp/escheduler/exec +process.exec.basepath=/tmp/dolphinscheduler/exec # Users who have permission to create directories under the HDFS root path hdfs.root.user=hdfs -# data base dir, resource file will store to this hadoop hdfs path, self configuration, please make sure the directory exists on hdfs and have read write permissions。"/escheduler" is recommended -data.store2hdfs.basepath=/escheduler +# data base dir, resource file will store to this hadoop hdfs path, self configuration, please make sure the directory exists on hdfs and have read write permissions。"/dolphinscheduler" is recommended +data.store2hdfs.basepath=/dolphinscheduler # resource upload startup type : HDFS,S3,NONE res.upload.startup.type=NONE @@ -32,7 +32,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM login.user.keytab.path=/opt/hdfs.headless.keytab # system env path. self configuration, please make sure the directory and file exists and have read write execute permissions -escheduler.env.path=/opt/escheduler/conf/env/.escheduler_env.sh +dolphinscheduler.env.path=/opt/dolphinscheduler/conf/env/.dolphinscheduler_env.sh #resource.view.suffixs resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml diff --git a/dockerfile/conf/escheduler/conf/common/hadoop/hadoop.properties b/dockerfile/conf/dolphinscheduler/conf/common/hadoop/hadoop.properties similarity index 88% rename from dockerfile/conf/escheduler/conf/common/hadoop/hadoop.properties rename to dockerfile/conf/dolphinscheduler/conf/common/hadoop/hadoop.properties index 81452a83a28818494eb801ffa700886f366952e3..4bb41f9268766567c2d4b0cfb61a78e7fab4c599 100644 --- a/dockerfile/conf/escheduler/conf/common/hadoop/hadoop.properties +++ b/dockerfile/conf/dolphinscheduler/conf/common/hadoop/hadoop.properties @@ -1,5 +1,5 @@ # ha or single namenode,If namenode ha needs to copy core-site.xml and hdfs-site.xml -# to the conf directory，support s3，for example : s3a://escheduler +# to the conf directory，support s3，for example : s3a://dolphinscheduler fs.defaultFS=hdfs://mycluster:8020 # s3 need，s3 endpoint diff --git a/dockerfile/conf/dolphinscheduler/conf/config/install_config.conf b/dockerfile/conf/dolphinscheduler/conf/config/install_config.conf new file mode 100644 index 0000000000000000000000000000000000000000..3f01633da9ddf43d07b76bd2227cccb807fd4a99 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/config/install_config.conf @@ -0,0 +1,3 @@ +installPath=/data1_1T/dolphinscheduler +deployUser=dolphinscheduler +ips=ark0,ark1,ark2,ark3,ark4 diff --git a/dockerfile/conf/escheduler/conf/config/run_config.conf b/dockerfile/conf/dolphinscheduler/conf/config/run_config.conf similarity index 100% rename from dockerfile/conf/escheduler/conf/config/run_config.conf rename to dockerfile/conf/dolphinscheduler/conf/config/run_config.conf diff --git a/dockerfile/conf/escheduler/conf/dao/data_source.properties b/dockerfile/conf/dolphinscheduler/conf/dao/data_source.properties similarity index 100% rename from dockerfile/conf/escheduler/conf/dao/data_source.properties rename to dockerfile/conf/dolphinscheduler/conf/dao/data_source.properties diff --git a/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh b/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh new file mode 100644 index 0000000000000000000000000000000000000000..fd598ff65797b016bf6786db74a92246be955756 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh @@ -0,0 +1,3 @@ +export PYTHON_HOME=/usr/bin/python +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +export PATH=$PYTHON_HOME:$JAVA_HOME/bin:$PATH diff --git a/dockerfile/conf/escheduler/conf/env/.escheduler_env.sh b/dockerfile/conf/dolphinscheduler/conf/env/.escheduler_env.sh similarity index 100% rename from dockerfile/conf/escheduler/conf/env/.escheduler_env.sh rename to dockerfile/conf/dolphinscheduler/conf/env/.escheduler_env.sh diff --git a/dockerfile/conf/escheduler/conf/i18n/messages.properties b/dockerfile/conf/dolphinscheduler/conf/i18n/messages.properties similarity index 99% rename from dockerfile/conf/escheduler/conf/i18n/messages.properties rename to dockerfile/conf/dolphinscheduler/conf/i18n/messages.properties index 88509558a99dc9954bcfe2c231bfd8081103cf32..44787fd78fe17d693dc7cd283e757e47ebbfd063 100644 --- a/dockerfile/conf/escheduler/conf/i18n/messages.properties +++ b/dockerfile/conf/dolphinscheduler/conf/i18n/messages.properties @@ -111,9 +111,9 @@ UPDATE_PROJECT_NOTES=update project PROJECT_ID=project id QUERY_PROJECT_BY_ID_NOTES=query project info by project id QUERY_PROJECT_LIST_PAGING_NOTES=QUERY PROJECT LIST PAGING -QUERY_ALL_PROJECT_LIST_NOTES=query all project list DELETE_PROJECT_BY_ID_NOTES=delete project by id QUERY_UNAUTHORIZED_PROJECT_NOTES=query unauthorized project +QUERY_ALL_PROJECT_LIST_NOTES=query all project list QUERY_AUTHORIZED_PROJECT_NOTES=query authorized project TASK_RECORD_TAG=task record related operation QUERY_TASK_RECORD_LIST_PAGING_NOTES=query task record list paging diff --git a/dockerfile/conf/escheduler/conf/i18n/messages_en_US.properties b/dockerfile/conf/dolphinscheduler/conf/i18n/messages_en_US.properties similarity index 100% rename from dockerfile/conf/escheduler/conf/i18n/messages_en_US.properties rename to dockerfile/conf/dolphinscheduler/conf/i18n/messages_en_US.properties diff --git a/dockerfile/conf/escheduler/conf/i18n/messages_zh_CN.properties b/dockerfile/conf/dolphinscheduler/conf/i18n/messages_zh_CN.properties similarity index 100% rename from dockerfile/conf/escheduler/conf/i18n/messages_zh_CN.properties rename to dockerfile/conf/dolphinscheduler/conf/i18n/messages_zh_CN.properties index f23e6b7e36dbcb32065edb1824ca6abf59ebff07..46b027074757516abb1ef62b515e311120ac7909 100644 --- a/dockerfile/conf/escheduler/conf/i18n/messages_zh_CN.properties +++ b/dockerfile/conf/dolphinscheduler/conf/i18n/messages_zh_CN.properties @@ -172,8 +172,8 @@ VIEW_TREE_NOTES=树状图 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=获得任务节点列表通过流程定义ID PROCESS_DEFINITION_ID_LIST=流程定义id列表 QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目ID -DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=批量删除流程定义通过流程定义ID集合 +DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID QUERY_PROCESS_INSTANCE_BY_ID_NOTES=查询流程实例通过流程实例ID DELETE_PROCESS_INSTANCE_BY_ID_NOTES=删除流程实例通过流程实例ID TASK_ID=任务实例ID diff --git a/dockerfile/conf/dolphinscheduler/conf/mail_templates/alert_mail_template.ftl b/dockerfile/conf/dolphinscheduler/conf/mail_templates/alert_mail_template.ftl new file mode 100644 index 0000000000000000000000000000000000000000..90c4b10cb979463582dcd77f67fb4ee99bd57aa8 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/mail_templates/alert_mail_template.ftl @@ -0,0 +1 @@ + dolphinscheduler<#if title??> ${title}<#if content??> ${content}
\ No newline at end of file diff --git a/dockerfile/conf/escheduler/conf/master.properties b/dockerfile/conf/dolphinscheduler/conf/master.properties similarity index 90% rename from dockerfile/conf/escheduler/conf/master.properties rename to dockerfile/conf/dolphinscheduler/conf/master.properties index 9080defc7b57480e2aafd4b3141d55eb92f10244..f65e8ec3d3b2ab3f2c290afa0490659d38af7aab 100644 --- a/dockerfile/conf/escheduler/conf/master.properties +++ b/dockerfile/conf/dolphinscheduler/conf/master.properties @@ -15,7 +15,7 @@ master.task.commit.interval=100 # only less than cpu avg load, master server can work. default value : the number of cpu cores * 2 -master.max.cpuload.avg=10 +master.max.cpuload.avg=100 # only larger than reserved memory, master server can work. default value : physical memory * 1/10, unit is G. -master.reserved.memory=1 +master.reserved.memory=0.1 diff --git a/dockerfile/conf/escheduler/conf/master_logback.xml b/dockerfile/conf/dolphinscheduler/conf/master_logback.xml similarity index 85% rename from dockerfile/conf/escheduler/conf/master_logback.xml rename to dockerfile/conf/dolphinscheduler/conf/master_logback.xml index cf08b9c8aba32f836fbf29d0866fb967ce2c2310..0a57b8a3d5036ed29d9d6773b03207bc2552b75c 100644 --- a/dockerfile/conf/escheduler/conf/master_logback.xml +++ b/dockerfile/conf/dolphinscheduler/conf/master_logback.xml @@ -11,12 +11,12 @@ - ${log.base}/escheduler-master.log + ${log.base}/dolphinscheduler-master.log INFO - ${log.base}/escheduler-master.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-master.%d{yyyy-MM-dd_HH}.%i.log 168 200MB diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..cc1c5cec034168cdadc85962ad3bff180a882f8d --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..77d3110cccff076cb521888cfd4b341a77a52fb7 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..df80071c7df27524e106f16e62a82997d1d19c0a --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..e3ab6b23c9a9aa9e638d0f9dc4869276363d3d4f --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..df8f4a5a2d13e9cf9c657fe762bbe65108625506 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..e67a922846b80e759c07e07e8abdf9b090d46cbd --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.xml @@ -0,0 +1,13 @@ + + + + + delete from t_ds_relation_datasource_user + where user_id = #{userId} + + + + delete from t_ds_relation_datasource_user + where datasource_id = #{datasourceId} + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..9fb103f82b204b0c2c67b908edc86c6741eabc70 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ed53f815406e48d2a894ba498c3680b88dba3159 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..49b087fe28a2bebd49079145151c2764c787221d --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.xml @@ -0,0 +1,26 @@ + + + + + delete + from t_ds_relation_process_instance + where parent_process_instance_id=#{parentProcessId} + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c1b7f909f6f1e86aee4a327049195f2966c1d5ea --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + update t_ds_process_instance + set host=null + where host =#{host} and state in + + #{i} + + + + update t_ds_process_instance + set state = #{destState} + where state = #{originState} + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..9c395ce8f10fe19f4dcd20c122cbf23420f791c7 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..06efa3a73dd377d28215d50ec870966248ea7330 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml @@ -0,0 +1,19 @@ + + + + + delete from t_ds_relation_project_user + where 1=1 + and user_id = #{userId} + + and project_id = #{projectId} + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..28477a57103d5e97dcfc478a7e8a77e0f4c707bd --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..180c5306d5be7d30b086d92578472e9ae095ba62 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5d452d4e7856f99b656e2ed4aa13827a198bcbab --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml @@ -0,0 +1,15 @@ + + + + + delete + from t_ds_relation_resources_user + where 1 = 1 + + and user_id = #{userId} + + + and resources_id = #{resourceId} + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..093fb7d963787cbd5e2f8320d659e25993c03e0f --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7647809e892182da62ef30868071ea0cf7c49ed1 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..77290dee79a131361c9c5889054ebbc038e97ca6 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml @@ -0,0 +1,113 @@ + + + + + update t_ds_task_instance + set state = #{destStatus} + where host = #{host} + and state in + + #{i} + + + + + + + + + + diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7217e4a7bcd20eb5d3903241f4098395b6fedeea --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TenantMapper.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..caa2a910ed4a63b993cfb87d6ed830f2ba9cb741 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.xml @@ -0,0 +1,12 @@ + + + + + delete from t_ds_relation_udfs_user + where `user_id` = #{userId} + + + delete from t_ds_relation_udfs_user + where `udf_id` = #{udfFuncId} + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..db63fe98f0322b3635d2043a97522dacd391998f --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1ea9e264fc5f60754a7f46d54d7ae6586150c77 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.xml @@ -0,0 +1,14 @@ + + + + + delete from t_ds_relation_user_alertgroup + where `alertgroup_id` = #{alertgroupId} + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..55562ce6e85e1bb6a68c95019bb2a203c2e9050e --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..1ff7c0742ee1764ae741fc9a6ba1c371d06fdb42 --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/dockerfile/conf/escheduler/conf/quartz.properties b/dockerfile/conf/dolphinscheduler/conf/quartz.properties similarity index 91% rename from dockerfile/conf/escheduler/conf/quartz.properties rename to dockerfile/conf/dolphinscheduler/conf/quartz.properties index 6cab37ff593fd3206c10d456cb38ccc084517b95..347464b051ad5ff2fed75ab1a3145e6ab570d66f 100644 --- a/dockerfile/conf/escheduler/conf/quartz.properties +++ b/dockerfile/conf/dolphinscheduler/conf/quartz.properties @@ -30,7 +30,7 @@ org.quartz.jobStore.dataSource = myDs #============================================================================ # Configure Datasources #============================================================================ - +org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider org.quartz.dataSource.myDs.driver = com.mysql.jdbc.Driver org.quartz.dataSource.myDs.URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?characterEncoding=utf8 org.quartz.dataSource.myDs.user=root diff --git a/dockerfile/conf/escheduler/conf/worker.properties b/dockerfile/conf/dolphinscheduler/conf/worker.properties similarity index 100% rename from dockerfile/conf/escheduler/conf/worker.properties rename to dockerfile/conf/dolphinscheduler/conf/worker.properties diff --git a/dockerfile/conf/escheduler/conf/worker_logback.xml b/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml similarity index 90% rename from dockerfile/conf/escheduler/conf/worker_logback.xml rename to dockerfile/conf/dolphinscheduler/conf/worker_logback.xml index f061d01dc0b3dd67d5ca504e1f8d00f8eb64d8c6..06c3a29637b32dc594ee8af595ae7e9a2f132afc 100644 --- a/dockerfile/conf/escheduler/conf/worker_logback.xml +++ b/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml @@ -16,6 +16,7 @@ taskAppId + ${log.base} @@ -32,13 +33,13 @@ - ${log.base}/escheduler-worker.log + ${log.base}/dolphinscheduler-worker.log INFO - ${log.base}/escheduler-worker.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log 168 200MB diff --git a/dockerfile/conf/dolphinscheduler/conf/zookeeper.properties b/dockerfile/conf/dolphinscheduler/conf/zookeeper.properties new file mode 100644 index 0000000000000000000000000000000000000000..9999e32101f7c4364b57a249fe163fedde5b3dbb --- /dev/null +++ b/dockerfile/conf/dolphinscheduler/conf/zookeeper.properties @@ -0,0 +1,25 @@ +#zookeeper cluster +zookeeper.quorum=127.0.0.1:2181 + +#dolphinscheduler root directory +zookeeper.dolphinscheduler.root=/dolphinscheduler + +#zookeeper server dirctory +zookeeper.dolphinscheduler.dead.servers=/dolphinscheduler/dead-servers +zookeeper.dolphinscheduler.masters=/dolphinscheduler/masters +zookeeper.dolphinscheduler.workers=/dolphinscheduler/workers + +#zookeeper lock dirctory +zookeeper.dolphinscheduler.lock.masters=/dolphinscheduler/lock/masters +zookeeper.dolphinscheduler.lock.workers=/dolphinscheduler/lock/workers + +#dolphinscheduler failover directory +zookeeper.dolphinscheduler.lock.failover.masters=/dolphinscheduler/lock/failover/masters +zookeeper.dolphinscheduler.lock.failover.workers=/dolphinscheduler/lock/failover/workers +zookeeper.dolphinscheduler.lock.failover.startup.masters=/dolphinscheduler/lock/failover/startup-masters + +#dolphinscheduler failover directory +zookeeper.session.timeout=300 +zookeeper.connection.timeout=300 +zookeeper.retry.sleep=1000 +zookeeper.retry.maxtime=5 \ No newline at end of file diff --git a/dockerfile/conf/escheduler/conf/config/install_config.conf b/dockerfile/conf/escheduler/conf/config/install_config.conf deleted file mode 100644 index 43b955d4f1652c89c2de1d7409937d965048fe52..0000000000000000000000000000000000000000 --- a/dockerfile/conf/escheduler/conf/config/install_config.conf +++ /dev/null @@ -1,3 +0,0 @@ -installPath=/data1_1T/escheduler -deployUser=escheduler -ips=ark0,ark1,ark2,ark3,ark4 diff --git a/dockerfile/conf/escheduler/conf/mail_templates/alert_mail_template.ftl b/dockerfile/conf/escheduler/conf/mail_templates/alert_mail_template.ftl deleted file mode 100644 index 0ff763fa28d69ce722fbb10db1128d107f507912..0000000000000000000000000000000000000000 --- a/dockerfile/conf/escheduler/conf/mail_templates/alert_mail_template.ftl +++ /dev/null @@ -1 +0,0 @@ - easyscheduler<#if title??> ${title}<#if content??> ${content}
\ No newline at end of file diff --git a/dockerfile/conf/escheduler/conf/zookeeper.properties b/dockerfile/conf/escheduler/conf/zookeeper.properties deleted file mode 100644 index 5f14df49b794f36c61487b9c6a941b4a846313e2..0000000000000000000000000000000000000000 --- a/dockerfile/conf/escheduler/conf/zookeeper.properties +++ /dev/null @@ -1,25 +0,0 @@ -#zookeeper cluster -zookeeper.quorum=127.0.0.1:2181 - -#escheduler root directory -zookeeper.escheduler.root=/escheduler - -#zookeeper server dirctory -zookeeper.escheduler.dead.servers=/escheduler/dead-servers -zookeeper.escheduler.masters=/escheduler/masters -zookeeper.escheduler.workers=/escheduler/workers - -#zookeeper lock dirctory -zookeeper.escheduler.lock.masters=/escheduler/lock/masters -zookeeper.escheduler.lock.workers=/escheduler/lock/workers - -#escheduler failover directory -zookeeper.escheduler.lock.failover.masters=/escheduler/lock/failover/masters -zookeeper.escheduler.lock.failover.workers=/escheduler/lock/failover/workers -zookeeper.escheduler.lock.failover.startup.masters=/escheduler/lock/failover/startup-masters - -#escheduler failover directory -zookeeper.session.timeout=300 -zookeeper.connection.timeout=300 -zookeeper.retry.sleep=1000 -zookeeper.retry.maxtime=5 \ No newline at end of file diff --git a/dockerfile/conf/nginx/default.conf b/dockerfile/conf/nginx/default.conf index 2d43c32b630c04095e57385a879476c010c21bba..f16d0886df05ab66b3f3b2589f272b3a05e5e286 100644 --- a/dockerfile/conf/nginx/default.conf +++ b/dockerfile/conf/nginx/default.conf @@ -4,10 +4,10 @@ server { #charset koi8-r; #access_log /var/log/nginx/host.access.log main; location / { - root /opt/easyscheduler_source/escheduler-ui/dist; + root /opt/easyscheduler_source/dolphinscheduler-ui/dist; index index.html index.html; } - location /escheduler { + location /dolphinscheduler { proxy_pass http://127.0.0.1:12345; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/dockerfile/hooks/build b/dockerfile/hooks/build index 779c38e66fe88c5314d737670a1ef16e61660a3e..172b2ac8689d65fe005fac24a144721dec6108e5 100644 --- a/dockerfile/hooks/build +++ b/dockerfile/hooks/build @@ -1,8 +1,8 @@ #!/bin/bash -echo "------ escheduler start - build -------" +echo "------ dolphinscheduler start - build -------" printenv docker build --build-arg version=$version --build-arg tar_version=$tar_version -t $DOCKER_REPO:$version . -echo "------ escheduler end - build -------" +echo "------ dolphinscheduler end - build -------" diff --git a/dockerfile/startup.sh b/dockerfile/startup.sh index 8aed67f39421aa41e69ea23ce3a97a5c6d599334..1d7f76b1733d25fcc5f181697bff80c66edd5ab8 100644 --- a/dockerfile/startup.sh +++ b/dockerfile/startup.sh @@ -5,7 +5,7 @@ if [ `netstat -anop|grep mysql|wc -l` -gt 0 ];then echo "MySQL is Running." else MYSQL_ROOT_PWD="root@123" - ESZ_DB="escheduler" + ESZ_DB="dolphinscheduler" echo "启动mysql服务" chown -R mysql:mysql /var/lib/mysql /var/run/mysqld find /var/lib/mysql -type f -exec touch {} \; && service mysql restart $ sleep 10 @@ -15,55 +15,55 @@ else echo "设置mysql权限" mysql --user=root --password=$MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$MYSQL_ROOT_PWD' WITH GRANT OPTION; FLUSH PRIVILEGES;" - echo "创建escheduler数据库" + echo "创建dolphinscheduler数据库" mysql --user=root --password=$MYSQL_ROOT_PWD -e "CREATE DATABASE IF NOT EXISTS \`$ESZ_DB\` CHARACTER SET utf8 COLLATE utf8_general_ci; FLUSH PRIVILEGES;" echo "导入mysql数据" - nohup /opt/escheduler/script/create_escheduler.sh & + nohup /opt/dolphinscheduler/script/create-dolphinscheduler.sh & sleep 90 fi - - if [ `mysql --user=root --password=$MYSQL_ROOT_PWD -s -r -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='escheduler';" | grep -v count` -eq 38 ];then + + if [ `mysql --user=root --password=$MYSQL_ROOT_PWD -s -r -e "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='dolphinscheduler';" | grep -v count` -eq 38 ];then echo "\`$ESZ_DB\` 表个数正确" else echo "\`$ESZ_DB\` 表个数不正确" mysql --user=root --password=$MYSQL_ROOT_PWD -e "DROP DATABASE \`$ESZ_DB\`;" - echo "创建escheduler数据库" + echo "创建dolphinscheduler数据库" mysql --user=root --password=$MYSQL_ROOT_PWD -e "CREATE DATABASE IF NOT EXISTS \`$ESZ_DB\` CHARACTER SET utf8 COLLATE utf8_general_ci; FLUSH PRIVILEGES;" echo "导入mysql数据" - nohup /opt/escheduler/script/create_escheduler.sh & + nohup /opt/dolphinscheduler/script/create-dolphinscheduler.sh & sleep 90 fi fi -/opt/zookeeper/bin/zkServer.sh restart +/opt/zookeeper/bin/zkServer.sh restart sleep 90 echo "启动api-server" -/opt/escheduler/bin/escheduler-daemon.sh stop api-server -/opt/escheduler/bin/escheduler-daemon.sh start api-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh stop api-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh start api-server echo "启动master-server" -/opt/escheduler/bin/escheduler-daemon.sh stop master-server -python /opt/escheduler/script/del_zk_node.py 127.0.0.1 /escheduler/masters -/opt/escheduler/bin/escheduler-daemon.sh start master-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh stop master-server +python /opt/dolphinscheduler/script/del-zk-node.py 127.0.0.1 /dolphinscheduler/masters +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh start master-server echo "启动worker-server" -/opt/escheduler/bin/escheduler-daemon.sh stop worker-server -python /opt/escheduler/script/del_zk_node.py 127.0.0.1 /escheduler/workers -/opt/escheduler/bin/escheduler-daemon.sh start worker-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh stop worker-server +python /opt/dolphinscheduler/script/del-zk-node.py 127.0.0.1 /dolphinscheduler/workers +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh start worker-server echo "启动logger-server" -/opt/escheduler/bin/escheduler-daemon.sh stop logger-server -/opt/escheduler/bin/escheduler-daemon.sh start logger-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh stop logger-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh start logger-server echo "启动alert-server" -/opt/escheduler/bin/escheduler-daemon.sh stop alert-server -/opt/escheduler/bin/escheduler-daemon.sh start alert-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh stop alert-server +/opt/dolphinscheduler/bin/dolphinscheduler-daemon.sh start alert-server @@ -72,7 +72,7 @@ echo "启动alert-server" echo "启动nginx" /etc/init.d/nginx stop nginx & - + while true do diff --git a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql index b07547527099d06718856f6ffa956d247ce9b59b..4bedb7b431a9d76ac8bd859aeb370d50d6eb1858 100644 --- a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql +++ b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql @@ -1,7 +1,7 @@ --- Records of t_escheduler_user,user : admin , password : escheduler123 -INSERT INTO `t_escheduler_user` VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22'); +-- Records of t_escheduler_user,user : admin , password : dolphinscheduler123 +INSERT INTO `t_escheduler_user` VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22'); INSERT INTO `t_escheduler_alertgroup` VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39'); INSERT INTO `t_escheduler_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33'); -- Records of t_escheduler_queue,default queue name : default -INSERT INTO `t_escheduler_queue` VALUES ('1', 'default', 'default'); \ No newline at end of file +INSERT INTO `t_escheduler_queue` VALUES ('1', 'default', 'default'); diff --git a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql index 72e60ace3b2ff18a25acfa16c299412719cb4662..cfaeb56cf6163ad5a13dbafb2ab0c191cb79bb4a 100644 --- a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql +++ b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql @@ -1,8 +1,8 @@ --- Records of t_escheduler_user,user : admin , password : escheduler123 -INSERT INTO "t_escheduler_user" VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22'); +-- Records of t_escheduler_user,user : admin , password : dolphinscheduler123 +INSERT INTO "t_escheduler_user" VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22'); INSERT INTO "t_escheduler_alertgroup" VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39'); INSERT INTO "t_escheduler_relation_user_alertgroup" VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33'); -- Records of t_escheduler_queue,default queue name : default INSERT INTO "t_escheduler_queue" VALUES ('1', 'default', 'default'); -INSERT INTO "t_escheduler_version" VALUES ('1', '1.2.0'); \ No newline at end of file +INSERT INTO "t_escheduler_version" VALUES ('1', '1.2.0');