From ccf424cf4b449fbd4e8d5447255e785036a63011 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Wed, 10 Mar 2021 17:00:50 +0000
Subject: [DMAAP-ZK] Fix docker build

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Iabb736232bec4eff4280cdc199bc4e8e64e4e462
Issue-ID: DMAAP-1565
---
 pom.xml                    |  2 +-
 src/main/docker/Dockerfile | 12 +++++++-----
 version.properties         |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92491df..a0a962e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
 	<groupId>org.onap.dmaap.zookeeper</groupId>
 	<artifactId>zookeeper</artifactId>
-	<version>6.0.3-SNAPSHOT</version>
+	<version>6.0.4-SNAPSHOT</version>
 	<name>zookeeper</name>
 	<licenses>
 		<license>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 301aa6d..30d73c5 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -4,11 +4,13 @@ ENV COMPONENT=zookeeper \
     ZK_USER=mrzookeeper
 
 RUN echo "===> installing ${COMPONENT}..." \
-    && apt-get update && apt-get install -y confluent-kafka-${SCALA_VERSION}=${CONFLUENT_VERSION}${CONFLUENT_PLATFORM_LABEL}-${CONFLUENT_DEB_VERSION} \
-    \
+    && wget -qO - http://packages.confluent.io/deb/3.0/archive.key | apt-key add - \
+    && echo "deb [arch=amd64] http://packages.confluent.io/deb/3.0 stable main" | tee -a /etc/apt/sources.list \
+    && apt-key update && apt-get update && apt-get install -y confluent-kafka-2.11 --force-yes \
+    && echo "===> clean up ..."  \
+    && apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \
     && echo "===> clean up ..."  \
     && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \
-    \
     && echo "===> Setting up ${COMPONENT} dirs" \
     && mkdir -p /var/lib/${COMPONENT}/data  /var/lib/${COMPONENT}/log /etc/${COMPONENT}/secrets/jaas /etc/${COMPONENT}/data  /var/log/kafka /var/log/confluent  \
     && chmod -R ag+w /etc/kafka /var/lib/${COMPONENT}/data /var/lib/${COMPONENT}/log  /etc/${COMPONENT}/secrets /etc/${COMPONENT}/data  /var/log/kafka /var/log/confluent \
@@ -16,8 +18,8 @@ RUN echo "===> installing ${COMPONENT}..." \
     
 RUN set -x \
     && apt-get update \
-     && apt-get install -y git \
-     && git clone -b master --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git /tmp/zookeeper/gerrit 	
+    && apt-get install -y git --force-yes \
+    && git clone -b master --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git /tmp/zookeeper/gerrit
 
 COPY include/etc/confluent/docker /etc/confluent/docker
 RUN chmod -R +x /etc/confluent/docker
diff --git a/version.properties b/version.properties
index a24dffa..352582b 100644
--- a/version.properties
+++ b/version.properties
@@ -26,7 +26,7 @@
 
 major=6
 minor=0
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg