From 97d04ee738fca52d34b83a144a13dbeb1d1820c1 Mon Sep 17 00:00:00 2001
From: sunil unnava <sunil.unnava@att.com>
Date: Tue, 20 Nov 2018 15:29:12 -0500
Subject: creates the Zookeeper image

Issue-ID: DMAAP-888
Change-Id: I955009a5e16c5fc543911496d581d5f49e2172cd
Signed-off-by: sunil unnava <sunil.unnava@att.com>
---
 pom.xml                    |  2 +-
 src/main/docker/Dockerfile | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index e137bed..71608e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
 						</goals>
 						<configuration>
 							<image>onap/dmaap/zookeeper</image>
-							<newName>${docker.push.registry}/onap/dmaap/zookeeper1:${zookeeperImg}</newName>
+							<newName>${docker.push.registry}/onap/dmaap/zookeeper:${zookeeperImg}</newName>
 							<skipDockerTag>${skip.docker.push}</skipDockerTag>
 						</configuration>
 					</execution>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 905b27d..2d271e4 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,22 +1,19 @@
-FROM ubuntu:16.04 
+FROM ubuntu:16.04
+
 ENV ZK_USER=zookeeper \
 ZK_DATA_DIR=/var/lib/zookeeper/data \
 ZK_DATA_LOG_DIR=/var/lib/zookeeper/log \
 ZK_LOG_DIR=/var/log/zookeeper \
-JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 
-ARG GPG_KEY=C823E3E5B12AF29C67F81976F5CECB3CB5E9BD2D
+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 ARG ZK_DIST=zookeeper-3.4.10
 RUN set -x \
     && apt-get update \
     && 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" \
     && 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" \
+    && 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 \
@@ -35,8 +32,9 @@ RUN set -x \
     /opt/zookeeper/$ZK_DIST.jar.asc \
     /opt/zookeeper/$ZK_DIST.jar.md5 \
     /opt/zookeeper/$ZK_DIST.jar.sha1 \
-	&& apt-get autoremove -y wget \
-	&& rm -rf /var/lib/apt/lists/*
+        && apt-get autoremove -y wget \
+        && rm -rf /var/lib/apt/lists/*
+
 
 #Copy configuration generator script to bin
 COPY scripts /opt/zookeeper/bin/
-- 
cgit 1.2.3-korg