X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=d837fb909f741709fae09db3529e413dce843b59;hb=2d0abde46befe2ab7550d02a1e5f182317adb8ec;hp=d08cc51a9d55b409b767c44baaee76923272dee0;hpb=6bd0d04630efa61bff5711395cc7e5c532cba052;p=dmaap%2Fkafka11aaf.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index d08cc51..d837fb9 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java
 
-ARG kafka_version=0.11.0.1
+ARG kafka_version=1.1.1
 ARG scala_version=2.12
 
 
@@ -18,6 +18,7 @@ ADD consumer.properties /opt/etc/consumer.properties
 ADD producer.properties /opt/etc/producer.properties
 ADD kafka11aaf-jar-with-dependencies.jar /tmp/kafka11aaf-jar-with-dependencies.jar
 ADD dmaapMMAgent.jar /tmp/dmaapMMAgent.jar
+ADD kafka-run-class.sh /tmp/kafka-run-class.sh
 
 RUN chmod a+x /tmp/download-kafka.sh && sync && /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz && ln -s /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION} /opt/kafka
 
@@ -30,12 +31,11 @@ ADD broker-list.sh /usr/bin/broker-list.sh
 ADD create-topics.sh /usr/bin/create-topics.sh
 ADD start-kafkaOrMirrorMaker.sh /usr/bin/start-kafkaOrMirrorMaker.sh
 ADD start-mirrormaker.sh /usr/bin/start-mirrormaker.sh
-ADD kafka-run-class.sh ${KAFKA_HOME}/bin/kafka-run-class.sh
-
-RUN set -x \
-    && useradd kafka \
-    && chown -R kafka:kafka  /opt/kafka /opt/logs /opt/etc /kafka /tmp/kafka-logs /usr/bin
-
-USER kafka
-
+# The scripts need to have executable permission
+RUN chmod a+x /usr/bin/start-kafka.sh && \
+    chmod a+x /usr/bin/broker-list.sh && \
+    chmod a+x /usr/bin/start-kafkaOrMirrorMaker.sh && \
+    chmod a+x /usr/bin/start-mirrormaker.sh && \
+    chmod a+x /usr/bin/create-topics.sh
+# Use "exec" form so that it runs as PID 1 (useful for graceful shutdown)
 CMD ["start-kafkaOrMirrorMaker.sh"]