From 22308c7048ab5e024906f3a02274736c2627f4cc Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Thu, 10 Dec 2020 16:11:20 +0800
Subject: [PATCH] [Improve-4143][docker]No need to install kazoo

---
 docker/build/Dockerfile                | 3 +--
 docker/build/startup-init-conf.sh      | 4 ++--
 docker/docker-swarm/docker-compose.yml | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index ebc2d7616e..a870dd3cd6 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -29,8 +29,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apk update && \
     apk --update add --no-cache dos2unix shadow bash openrc python2 python3 sudo vim wget iputils net-tools openssh-server py-pip tini && \
     apk add --update procps && \
-    openrc boot && \
-    pip install kazoo
+    openrc boot
 
 #2. install jdk
 RUN apk add openjdk8
diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh
index face6be4b7..ac21fe422b 100644
--- a/docker/build/startup-init-conf.sh
+++ b/docker/build/startup-init-conf.sh
@@ -38,9 +38,9 @@ export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"}
 #============================================================================
 export DOLPHINSCHEDULER_ENV_PATH=${DOLPHINSCHEDULER_ENV_PATH:-"/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh"}
 export DOLPHINSCHEDULER_DATA_BASEDIR_PATH=${DOLPHINSCHEDULER_DATA_BASEDIR_PATH:-"/tmp/dolphinscheduler"}
-export RESOURCE_STORAGE_TYPE=${DOLPHINSCHEDULER_RESOURCE_STORAGE_TYPE:-"HDFS"}
+export DOLPHINSCHEDULER_RESOURCE_STORAGE_TYPE=${DOLPHINSCHEDULER_RESOURCE_STORAGE_TYPE:-"HDFS"}
 export RESOURCE_UPLOAD_PATH=${RESOURCE_UPLOAD_PATH:-"/ds"}
-export FS_DEFAULT_FS=${DOLPHINSCHEDULER_FS_DEFAULT_FS:-"file:///data/dolphinscheduler"}
+export DOLPHINSCHEDULER_FS_DEFAULTFS=${DOLPHINSCHEDULER_FS_DEFAULTFS:-"file:///data/dolphinscheduler"}
 export FS_S3A_ENDPOINT=${FS_S3A_ENDPOINT:-"s3.xxx.amazonaws.com"}
 export FS_S3A_ACCESS_KEY=${FS_S3A_ACCESS_KEY:-"xxxxxxx"}
 export FS_S3A_SECRET_KEY=${FS_S3A_SECRET_KEY:-"xxxxxxx"}
diff --git a/docker/docker-swarm/docker-compose.yml b/docker/docker-swarm/docker-compose.yml
index 16af4a3273..5ef116edba 100644
--- a/docker/docker-swarm/docker-compose.yml
+++ b/docker/docker-swarm/docker-compose.yml
@@ -63,6 +63,7 @@ services:
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      ZOOKEEPER_ROOT: /dolphinscheduler
       DOLPHINSCHEDULER_RESOURCE_STORAGE_TYPE: "HDFS"
       DOLPHINSCHEDULER_FS_DEFAULTFS: "file:///data/dolphinscheduler"
     healthcheck:
@@ -162,6 +163,7 @@ services:
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      ZOOKEEPER_ROOT: /dolphinscheduler
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "MasterServer"]
       interval: 30s
@@ -198,6 +200,7 @@ services:
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      ZOOKEEPER_ROOT: /dolphinscheduler
       DOLPHINSCHEDULER_RESOURCE_STORAGE_TYPE: "HDFS"
       DOLPHINSCHEDULER_FS_DEFAULTFS: "file:///data/dolphinscheduler"
     healthcheck: