From 1991c045e7ba0f7a3a0f662c0028fdb2faee8ffb Mon Sep 17 00:00:00 2001
From: yangyu <yangyu@yqclouds.com>
Date: Wed, 1 Aug 2018 21:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89zo?=
 =?UTF-8?q?o.cfg=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zookeeper/3.4.12/Dockerfile   |  8 ++------
 zookeeper/3.4.12/conf/zoo.cfg |  6 ++++++
 zookeeper/3.4.12/start.sh     |  4 ++++
 zookeeper/README.md           | 10 +++++++++-
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 zookeeper/3.4.12/conf/zoo.cfg

diff --git a/zookeeper/3.4.12/Dockerfile b/zookeeper/3.4.12/Dockerfile
index 4265b36..8f726ca 100644
--- a/zookeeper/3.4.12/Dockerfile
+++ b/zookeeper/3.4.12/Dockerfile
@@ -17,12 +17,8 @@ RUN echo "ZONE=Asia/Shanghai" > /etc/sysconfig/clock && \
     rm -rf /etc/localtime && \
     ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-RUN echo "tickTime=2000" >> /zookeeper/conf/zoo.cfg && \
-    echo "dataDir=/data" >> /zookeeper/conf/zoo.cfg && \
-    echo "clientPort=2181" >> /zookeeper/conf/zoo.cfg && \
-    echo "initLimit=5" >> /zookeeper/conf/zoo.cfg && \
-    echo "syncLimit=2" >> /zookeeper/conf/zoo.cfg && \
-    echo "quorumListenOnAllIPs=true" >> /zookeeper/conf/zoo.cfg
+COPY conf/zoo.cfg /zookeeper/conf/
+
 
 RUN sed -i 's/ZOO_LOG_DIR="."/ZOO_LOG_DIR="\/logs"/' /zookeeper/bin/zkEnv.sh && \
     sed -i 's/ZOO_LOG4J_PROP="INFO,CONSOLE"/ZOO_LOG4J_PROP="INFO,ROLLINGFILE"/' /zookeeper/bin/zkEnv.sh && \
diff --git a/zookeeper/3.4.12/conf/zoo.cfg b/zookeeper/3.4.12/conf/zoo.cfg
new file mode 100644
index 0000000..5ef9214
--- /dev/null
+++ b/zookeeper/3.4.12/conf/zoo.cfg
@@ -0,0 +1,6 @@
+tickTime=2000
+dataDir=/data
+clientPort=2181
+initLimit=5
+syncLimit=2
+quorumListenOnAllIPs=true
diff --git a/zookeeper/3.4.12/start.sh b/zookeeper/3.4.12/start.sh
index 1c31487..c4ca85a 100644
--- a/zookeeper/3.4.12/start.sh
+++ b/zookeeper/3.4.12/start.sh
@@ -2,6 +2,10 @@
 
 echo "$ZOO_MY_ID" > /data/myid
 
+if [ -e /conf/zoo.cfg ]; then
+  \cp /conf/zoo.cfg /zookeeper/conf/
+fi
+
 if [ -n "$SERVICE_1" ]; then
     if [ `grep -c "server.1" /zookeeper/conf/zoo.cfg` -eq '0' ]; then
         echo "server.1=$SERVICE_1" >> /zookeeper/conf/zoo.cfg
diff --git a/zookeeper/README.md b/zookeeper/README.md
index 4e1a9ab..3de6abb 100644
--- a/zookeeper/README.md
+++ b/zookeeper/README.md
@@ -8,9 +8,12 @@ docker build -t ccr.ccs.tencentyun.com/yy-dk/zookeeper:3.4.12 .
 ```bash
 docker run -d \
     --privileged=true \
-    --net=host \
+    -p 2181:2181 \
+    -p 2888:2888 \
+    -p 3888:3888 \
     -v /data/zookeeper/data:/data \
     -v /data/zookeeper/logs:/logs \
+    -v /data/zookeeper/conf:/conf \
     -e ZOO_MY_ID=1 \
     -e SERVICE_1=10.211.55.11:2888:3888 \
     -e SERVICE_2=10.211.55.12:2888:3888 \
@@ -18,6 +21,11 @@ docker run -d \
     --name zookeeper \
     ccr.ccs.tencentyun.com/yy-dk/zookeeper:3.4.12 
 ```
+
+- data:zookeeper 数据文件夹
+- logs:zookeeper 日志文件夹
+- conf:zookeeper 配置文件目录，若conf目录下包含 zoo.cfg 将覆盖zookeeper目录下的配置文件，方便用户自定义配置文件
+
 ## 查看容器状态
 ```bash
 docker exec -it zookeeper zkServer.sh status