diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/docker/Dockerfile | 17 | ||||
| -rw-r--r-- | src/main/docker/scripts/start-zookeeper.sh | 2 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 6ca395b..5584025 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -6,7 +6,7 @@ ENV ZK_USER=root \ ZK_LOG_DIR=/var/log/zookeeper \ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 -ARG GPG_KEY=C823E3E5B12AF29C67F81976F5CECB3CB5E9BD2D + ARG ZK_DIST=zookeeper-3.4.10 RUN set -x \ @@ -14,11 +14,8 @@ RUN set -x \ && apt-get install -y openjdk-8-jre-headless wget netcat-openbsd \ && wget -q "http://www.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \ && wget -q "http://www.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-key "$GPG_KEY" \ - && gpg --batch --verify "$ZK_DIST.tar.gz.asc" "$ZK_DIST.tar.gz" \ - && tar -xzf "$ZK_DIST.tar.gz" -C /opt \ - && rm -r "$GNUPGHOME" "$ZK_DIST.tar.gz" "$ZK_DIST.tar.gz.asc" \ + && tar -xzf "$ZK_DIST.tar.gz" -C /opt \ + && rm -r "$ZK_DIST.tar.gz" "$ZK_DIST.tar.gz.asc" \ && ln -s /opt/$ZK_DIST /opt/zookeeper \ && rm -rf /opt/zookeeper/CHANGES.txt \ /opt/zookeeper/README.txt \ @@ -43,13 +40,9 @@ RUN set -x \ # Copy configuration generator script to bin COPY scripts /opt/zookeeper/bin/ - # Create a user for the zookeeper process and configure file system ownership # for necessary directories and symlink the distribution as a user executable RUN set -x \ - && useradd $ZK_USER \ - && [ `id -u $ZK_USER` -eq 1000 ] \ - && [ `id -g $ZK_USER` -eq 1000 ] \ && mkdir -p $ZK_DATA_DIR $ZK_DATA_LOG_DIR $ZK_LOG_DIR /usr/share/zookeeper /tmp/zookeeper /usr/etc/ \ && chown -R "$ZK_USER:$ZK_USER" /opt/$ZK_DIST $ZK_DATA_DIR $ZK_LOG_DIR $ZK_DATA_LOG_DIR /tmp/zookeeper \ && ln -s /opt/zookeeper/conf/ /usr/etc/zookeeper \ @@ -58,7 +51,7 @@ RUN set -x \ && ln -s /opt/zookeeper/lib/* /usr/share/zookeeper -RUN chown -R $ZK_USER:$ZK_USER /var/lib/zookeeper/data/myid + RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/start-zookeeper.sh RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/zookeeper-metrics.sh -RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/zookeeper-ready.sh
\ No newline at end of file +RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/zookeeper-ready.sh diff --git a/src/main/docker/scripts/start-zookeeper.sh b/src/main/docker/scripts/start-zookeeper.sh index 5222c78..9ae7a76 100644 --- a/src/main/docker/scripts/start-zookeeper.sh +++ b/src/main/docker/scripts/start-zookeeper.sh @@ -116,8 +116,10 @@ function create_data_dirs() { chown -R $ZK_USER:$ZK_USER $ZK_LOG_DIR fi + if [ $ZK_REPLICAS -gt 1 ]; then echo $MY_ID >> $ID_FILE cat $ID_FILE + fi echo "Created ZooKeeper data directories and set permissions in $ZK_DATA_DIR" } |