X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=c33069185e466f23126ca3d7f4c25efc447045b5;hb=bbaea416e64d2a4920c7377ec0a91b8ab36ded2b;hp=8e922b3b09dd587f71a72538cba2a82156189ebe;hpb=268f8e7800522608cffbc5df9c920c89e8de279a;p=dmaap%2Fkafka11aaf.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 8e922b3..c330691 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
 
 
@@ -9,15 +9,16 @@ RUN apk add --update unzip wget curl docker jq coreutils
 ENV KAFKA_VERSION=$kafka_version SCALA_VERSION=$scala_version
 ADD download-kafka.sh /tmp/download-kafka.sh
 ADD kafka_server_jaas.conf /tmp/kafka_server_jaas.conf
-ADD truststoreONAPall.jks /tmp/truststoreONAPall.jks
+ADD org.onap.dmaap.mr.trust.jks /tmp/org.onap.dmaap.mr.trust.jks
 ADD org.onap.dmaap.mr.p12 /tmp/org.onap.dmaap.mr.p12
-ADD keyfilenew /tmp/keyfilenew
+ADD org.onap.dmaap.mr.keyfile /tmp/org.onap.dmaap.mr.keyfile
 ADD cadi.properties /tmp/cadi.properties
 ADD mmagent.config /opt/etc/mmagent.config
 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,6 +31,8 @@ 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
+RUN mkdir /opt/logs
+RUN touch /opt/logs/mmagent.log
 # The scripts need to have executable permission
 RUN chmod a+x /usr/bin/start-kafka.sh && \
     chmod a+x /usr/bin/broker-list.sh && \
@@ -38,3 +41,9 @@ RUN chmod a+x /usr/bin/start-kafka.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"]
+
+RUN addgroup -S -g 1000  mrkafka  \
+    && adduser -S  -u 1000 mrkafka  mrkafka \
+    && chown -R mrkafka:mrkafka  /opt/kafka/ /opt/logs/ /opt/etc/ /kafka/  /usr/bin/ /tmp/
+
+USER mrkafka
\ No newline at end of file