docker: remove zookeeper from kafka docker

Remove zookeeper from kafka docker and add ability to specify kafka
broker id and address of zookeeper host.

Change-Id: Ib6f46cf326999dcd1440dc06ab5cf6665ec578ad
Signed-off-by: gordonkelly <gordon.kelly@intel.com>

diff --git a/docker/kafka/Dockerfile b/docker/kafka/Dockerfile
index 112cd33..3e2402e 100644 (file)
--- a/docker/kafka/Dockerfile
+++ b/docker/kafka/Dockerfile
@@ -3,18 +3,18 @@ RUN yum update -y && yum install -y epel-release \
                    wget \
                    https://archive.cloudera.com/cdh5/one-click-install/redhat/7/x86_64/cloudera-cdh-5-0.x86_64.rpm \
                    java-1.7.0-openjdk
-RUN yum install -y python-pip \
-                   zookeeper
+RUN yum install -y python-pip
 
 RUN pip install kafka-python
 
 ENV repos_dir /src
 WORKDIR ${repos_dir}
+EXPOSE 9092
 
 RUN wget "https://archive.apache.org/dist/kafka/1.0.0/kafka_2.11-1.0.0.tgz"
-RUN tar -xvzf kafka_2.11-1.0.0.tgz
+RUN tar -xzf kafka_2.11-1.0.0.tgz
 RUN sed -i -- 's/#delete.topic.enable=true/delete.topic.enable=true/' kafka_2.11-1.0.0/config/server.properties
-RUN /usr/lib/zookeeper/bin/zkServer-initialize.sh
-COPY start_kafka.sh ${repos_dir}
+
+COPY start_kafka.sh .
 RUN chmod 755 start_kafka.sh
 ENTRYPOINT ["/src/start_kafka.sh"]

diff --git a/docker/kafka/start_kafka.sh b/docker/kafka/start_kafka.sh
index 41388c4..abde2d1 100755 (executable)
--- a/docker/kafka/start_kafka.sh
+++ b/docker/kafka/start_kafka.sh
@@ -13,6 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-zookeeper-server start
-kafka_2.11-1.0.0/bin/kafka-server-start.sh kafka_2.11-1.0.0/config/server.properties > kafka_2.11-1.0.0/kafka.log 2>&1
+if [ -n "$broker_id" ]
+then
+  sed -i "s/broker.id=0/broker.id=$broker_id/" \
+  kafka_2.11-1.0.0/config/server.properties
+fi
+if [ -n "$zookeeper_node" ]
+then
+  sed -i "s/localhost:2181/$zookeeper_node:2181/" \
+  kafka_2.11-1.0.0/config/server.properties
+fi
 
+kafka_2.11-1.0.0/bin/kafka-server-start.sh kafka_2.11-1.0.0/config/server.properties > kafka_2.11-1.0.0/kafka.log 2>&1