From fe37fe57fef37eceefac619a3a0ed83cad617f9d Mon Sep 17 00:00:00 2001
From: Jorge Bianquetti <jbianquetti@bitnami.com>
Date: Fri, 12 May 2017 18:19:15 +0200
Subject: [PATCH] Initial commit

---
 bitnami/zookeeper/Dockerfile | 15 ++++++++-------
 bitnami/zookeeper/Makefile   | 12 ++++++++++++
 bitnami/zookeeper/circle.yml |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 bitnami/zookeeper/Makefile

diff --git a/bitnami/zookeeper/Dockerfile b/bitnami/zookeeper/Dockerfile
index 5949c58189f8..021504916854 100644
--- a/bitnami/zookeeper/Dockerfile
+++ b/bitnami/zookeeper/Dockerfile
@@ -1,28 +1,29 @@
-FROM bitnami/minideb-extras:jessie-r14
+FROM bitnami/minideb-extras:jessie-r15
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=zookeeper \
     BITNAMI_IMAGE_VERSION=0.1-r0 \
+    ZOOKEEPER_VERSION=3.4.10 \
     PATH=/opt/bitnami/zookeeper/bin:/opt/bitnami/java/bin:$PATH
 
 # Additional modules required
 RUN bitnami-pkg install java-1.8.0_121-0 --checksum 2743f753fd1ea88bf90352d95694f89ab0a0fb855cf0d1c7b2a6d92835f9ad27
 
 # Install zookeeper
-RUN curl http://apache.org/dist/zookeeper/stable/zookeeper-3.4.10.tar.gz > /tmp/zookeeper.tgz
-RUN mkdir -p /opt/bitnami/zookeeper && tar -vzxf /tmp/zookeeper.tgz --strip-components 1  -C /opt/bitnami/zookeeper
-RUN install -d -m 0755 -o bitnami -g bitnami  /var/zookeeper
+RUN curl -O  http://apache.org/dist/zookeeper/stable/zookeeper-${ZOOKEEPER_VERSION}.tar.gz 
 
+RUN mkdir -p /opt/bitnami/zookeeper /var/zookeeper  && \
+    tar -vzxf /zookeeper-${ZOOKEEPER_VERSION}.tar.gz --strip-components 1  -C /opt/bitnami/zookeeper && \
+    rm -f /zookeeper-${ZOOKEEPER_VERSION}.tar.gz
 
+RUN chown -R bitnami:bitnami /opt/bitnami/zookeeper/ /var/zookeeper 
 
 COPY rootfs /
 
-
-EXPOSE 7000 7001 9042 9160
-
 USER bitnami
 
+EXPOSE 2181 3888 2888
 
 CMD ["zkServer.sh", "start-foreground"]
 
diff --git a/bitnami/zookeeper/Makefile b/bitnami/zookeeper/Makefile
new file mode 100644
index 000000000000..44be022ff7e2
--- /dev/null
+++ b/bitnami/zookeeper/Makefile
@@ -0,0 +1,12 @@
+build:
+	docker build -t bitnami/zookeeper . 
+
+run:
+	docker run -it -p 2181:2181  bitnami/zookeeper 
+
+shell:
+	docker run -it -p 2181:2181  bitnami/zookeeper  bash 
+
+publish: 
+	docker push bitnami/zookeeper
+
diff --git a/bitnami/zookeeper/circle.yml b/bitnami/zookeeper/circle.yml
index 51371aa96357..af01b142be97 100644
--- a/bitnami/zookeeper/circle.yml
+++ b/bitnami/zookeeper/circle.yml
@@ -2,7 +2,7 @@ machine:
   services:
   - docker
   environment:
-    IMAGE_NAME: cassandra
+    IMAGE_NAME: zookeeper
     DOCKER_PROJECT: bitnami
     GCLOUD_PROJECT: bitnami-containers