From 58f75e6947a778925c350355704ef714171fcd03 Mon Sep 17 00:00:00 2001
From: Marcel Vogel <marcel.vogel@proemion.com>
Date: Thu, 16 May 2019 16:27:02 +0200
Subject: [PATCH] Updated to kafka version 2.2.0

---
 kafka/Dockerfile             | 5 +++--
 kafka/scripts/start-kafka.sh | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index f6a9004..9d15f69 100644
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,10 +1,10 @@
 # Kafka and Zookeeper
 
-FROM java:openjdk-8-jre
+FROM openjdk:8-jre-stretch
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV SCALA_VERSION 2.11
-ENV KAFKA_VERSION 0.10.1.0
+ENV KAFKA_VERSION 2.2.0
 ENV KAFKA_HOME /opt/kafka_"$SCALA_VERSION"-"$KAFKA_VERSION"
 
 # Install Kafka, Zookeeper and other needed things
@@ -17,6 +17,7 @@ RUN apt-get update && \
     rm /tmp/kafka_"$SCALA_VERSION"-"$KAFKA_VERSION".tgz
 
 ADD scripts/start-kafka.sh /usr/bin/start-kafka.sh
+RUN chmod +x /usr/bin/start-kafka.sh
 
 # Supervisor config
 ADD supervisor/kafka.conf supervisor/zookeeper.conf /etc/supervisor/conf.d/
diff --git a/kafka/scripts/start-kafka.sh b/kafka/scripts/start-kafka.sh
index 168fc97..34f9fbc 100755
--- a/kafka/scripts/start-kafka.sh
+++ b/kafka/scripts/start-kafka.sh
@@ -20,7 +20,7 @@ if [ ! -z "$ADVERTISED_HOST" ]; then
     if grep -q "^advertised.host.name" $KAFKA_HOME/config/server.properties; then
         sed -r -i "s/#(advertised.host.name)=(.*)/\1=$ADVERTISED_HOST/g" $KAFKA_HOME/config/server.properties
     else
-        echo "advertised.host.name=$ADVERTISED_HOST" >> $KAFKA_HOME/config/server.properties
+        echo "\n advertised.host.name=$ADVERTISED_HOST" >> $KAFKA_HOME/config/server.properties
     fi
 fi
 if [ ! -z "$ADVERTISED_PORT" ]; then
@@ -28,7 +28,7 @@ if [ ! -z "$ADVERTISED_PORT" ]; then
     if grep -q "^advertised.port" $KAFKA_HOME/config/server.properties; then
         sed -r -i "s/#(advertised.port)=(.*)/\1=$ADVERTISED_PORT/g" $KAFKA_HOME/config/server.properties
     else
-        echo "advertised.port=$ADVERTISED_PORT" >> $KAFKA_HOME/config/server.properties
+        echo "\n advertised.port=$ADVERTISED_PORT" >> $KAFKA_HOME/config/server.properties
     fi
 fi