[1.3.5-prepare][Fix][Docker] Fix sql task do not execute and send mail in docker

docker/build/Dockerfile

@@ -53,7 +53,7 @@ RUN dos2unix /root/checkpoint.sh && \
     dos2unix /opt/dolphinscheduler/bin/*.sh && \
     rm -rf /bin/sh && \
     ln -s /bin/bash /bin/sh && \
-    mkdir -p /tmp/xls && \
+    mkdir -p /var/mail /tmp/xls && \
     echo "Set disable_coredump false" >> /etc/sudo.conf
 
 # 4. expose port

docker/build/README.md

@@ -65,6 +65,8 @@ apache/dolphinscheduler:latest master-server
 ```
 $ docker run -d --name dolphinscheduler-worker \
 -e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
+-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
+-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
 -v dolphinscheduler-resource-local:/dolphinscheduler \
 apache/dolphinscheduler:latest worker-server
 ```

docker/build/README_zh_CN.md

@@ -64,6 +64,8 @@ apache/dolphinscheduler:latest master-server
 ```
 $ docker run -d --name dolphinscheduler-worker \
 -e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
+-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
+-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
 -v dolphinscheduler-resource-local:/dolphinscheduler \
 apache/dolphinscheduler:latest worker-server
 ```

docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh

@@ -15,6 +15,14 @@
 # limitations under the License.
 #
 
-export PYTHON_HOME=/usr/bin/python2
+export HADOOP_HOME=/opt/soft/hadoop
+export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
+export SPARK_HOME1=/opt/soft/spark1
+export SPARK_HOME2=/opt/soft/spark2
+export PYTHON_HOME=/usr/bin/python
 export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-export PATH=$PYTHON_HOME/bin:$JAVA_HOME/bin:$PATH
+export HIVE_HOME=/opt/soft/hive
+export FLINK_HOME=/opt/soft/flink
+export DATAX_HOME=/opt/soft/datax/bin/datax.py
+
+export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH

docker/build/startup.sh

@@ -143,6 +143,7 @@ case "$1" in
     ;;
     (worker-server)
         waitZK
+        waitDatabase
         initWorkerServer
         initLoggerServer
         LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-worker.log

docker/docker-swarm/docker-compose.yml

@@ -173,6 +173,20 @@ services:
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUP: "default"
       DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
+      XLS_FILE_PATH: "/tmp/xls"
+      MAIL_SERVER_HOST: ""
+      MAIL_SERVER_PORT: ""
+      MAIL_SENDER: ""
+      MAIL_USER: ""
+      MAIL_PASSWD: ""
+      MAIL_SMTP_STARTTLS_ENABLE: "false"
+      MAIL_SMTP_SSL_ENABLE: "false"
+      MAIL_SMTP_SSL_TRUST: ""
+      DATABASE_HOST: dolphinscheduler-postgresql
+      DATABASE_PORT: 5432
+      DATABASE_USERNAME: root
+      DATABASE_PASSWORD: root
+      DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
       RESOURCE_STORAGE_TYPE: HDFS
       RESOURCE_UPLOAD_PATH: /dolphinscheduler

docker/docker-swarm/docker-stack.yml

@@ -167,6 +167,20 @@ services:
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUP: "default"
       DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
+      XLS_FILE_PATH: "/tmp/xls"
+      MAIL_SERVER_HOST: ""
+      MAIL_SERVER_PORT: ""
+      MAIL_SENDER: ""
+      MAIL_USER: ""
+      MAIL_PASSWD: ""
+      MAIL_SMTP_STARTTLS_ENABLE: "false"
+      MAIL_SMTP_SSL_ENABLE: "false"
+      MAIL_SMTP_SSL_TRUST: ""
+      DATABASE_HOST: dolphinscheduler-postgresql
+      DATABASE_PORT: 5432
+      DATABASE_USERNAME: root
+      DATABASE_PASSWORD: root
+      DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
       RESOURCE_STORAGE_TYPE: HDFS
       RESOURCE_UPLOAD_PATH: /dolphinscheduler

docker/docker-swarm/dolphinscheduler_env.sh

@@ -15,6 +15,14 @@
 # limitations under the License.
 #
 
-export PYTHON_HOME=/usr/bin/python2
+export HADOOP_HOME=/opt/soft/hadoop
+export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
+export SPARK_HOME1=/opt/soft/spark1
+export SPARK_HOME2=/opt/soft/spark2
+export PYTHON_HOME=/usr/bin/python
 export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-export PATH=$PYTHON_HOME:$JAVA_HOME/bin:$PATH
+export HIVE_HOME=/opt/soft/hive
\ No newline at end of file
+export FLINK_HOME=/opt/soft/flink
+export DATAX_HOME=/opt/soft/datax/bin/datax.py
+
+export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH

docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml

@@ -99,6 +99,51 @@ spec:
                 configMapKeyRef:
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
                   key: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
+            - name: XLS_FILE_PATH
+              valueFrom:
+                configMapKeyRef:
+                  key: XLS_FILE_PATH
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SERVER_HOST
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SERVER_HOST
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SERVER_PORT
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SERVER_PORT
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SENDER
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SENDER
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_USER
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_USER
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_PASSWD
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_PASSWD
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_STARTTLS_ENABLE
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_STARTTLS_ENABLE
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_SSL_ENABLE
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_SSL_ENABLE
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_SSL_TRUST
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_SSL_TRUST
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
             - name: DATABASE_HOST
               {{- if .Values.postgresql.enabled }}
               value: {{ template "dolphinscheduler.postgresql.fullname" . }}