From e68d44623ad2322df2937311a378700a8b97e634 Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Wed, 21 Nov 2018 21:58:13 -0500 Subject: Changes to ZK config generation Issue-ID: DMAAP-888 Change-Id: I30196b1e64e42f35307b6fb1275edd206069b349 Signed-off-by: sunil unnava --- src/main/docker/Dockerfile | 7 +++++-- src/main/docker/scripts/start-zookeeper.sh | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 765dc9a..9ce7b2f 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:16.04 -ENV ZK_USER=zookeeper \ +ENV ZK_USER=root \ ZK_DATA_DIR=/var/lib/zookeeper/data \ ZK_DATA_LOG_DIR=/var/lib/zookeeper/log \ ZK_LOG_DIR=/var/log/zookeeper \ @@ -54,4 +54,7 @@ RUN set -x \ && ln -s /opt/zookeeper/conf/ /usr/etc/zookeeper \ && ln -s /opt/zookeeper/bin/* /usr/bin \ && ln -s /opt/zookeeper/$ZK_DIST.jar /usr/share/zookeeper/ \ -&& ln -s /opt/zookeeper/lib/* /usr/share/zookeeper \ No newline at end of file +&& ln -s /opt/zookeeper/lib/* /usr/share/zookeeper + +chmod 700 /opt/zookeeper/bin/start-zookeeper.sh +chmod 700 /var/lib/zookeeper/data/myid \ No newline at end of file diff --git a/src/main/docker/scripts/start-zookeeper.sh b/src/main/docker/scripts/start-zookeeper.sh index b2ea5a2..d77ec03 100644 --- a/src/main/docker/scripts/start-zookeeper.sh +++ b/src/main/docker/scripts/start-zookeeper.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ZK_USER=${ZK_USER:-"zookeeper"} +ZK_USER=${ZK_USER:-"root"} ZK_LOG_LEVEL=${ZK_LOG_LEVEL:-"INFO"} ZK_DATA_DIR=${ZK_DATA_DIR:-"/var/lib/zookeeper/data"} ZK_DATA_LOG_DIR=${ZK_DATA_LOG_DIR:-"/var/lib/zookeeper/log"} @@ -23,8 +23,8 @@ ID_FILE="$ZK_DATA_DIR/myid" ZK_CONFIG_FILE="$ZK_CONF_DIR/zoo.cfg" LOGGER_PROPS_FILE="$ZK_CONF_DIR/log4j.properties" JAVA_ENV_FILE="$ZK_CONF_DIR/java.env" -HOST=`hostname -s` -DOMAIN=`hostname -d` +HOST=$(hostname -s) +DOMAIN=$(hostname -d) function print_servers() { for (( i=1; i<=$ZK_REPLICAS; i++ )) -- cgit 1.2.3-korg