From 99ac3680dbc0bdf17d1e3ccc53d81c59eaf8be57 Mon Sep 17 00:00:00 2001
From: "sunil.unnava" <su622b@att.com>
Date: Sat, 23 Mar 2019 00:16:07 -0400
Subject: [PATCH] revert Dockerfile changes for image optimization

Issue-ID: DMAAP-909
Change-Id: I0c1a73513ba294946816a3a9f99379672c0837fa
Signed-off-by: sunil.unnava <su622b@att.com>
---
 src/main/docker/Dockerfile | 88 +++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 60 deletions(-)

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index e69c31b..b7f303d 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,73 +1,41 @@
-#########
-#  ============LICENSE_START====================================================
-#  org.onap.dmaap
-#  ===========================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  Modifications Copyright (C) 2018 Nokia. All rights reserved.
-#  ===========================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END====================================================
-#
 FROM anapsix/alpine-java
 
-MAINTAINER DMAAP Team
-
 ARG kafka_version=0.11.0.1
 ARG scala_version=2.12
 
-VOLUME ["/kafka"]
 
-ENV KAFKA_VERSION $kafka_version
-ENV SCALA_VERSION $scala_version
-ENV KAFKA_HOME /opt/kafka
-ENV PATH ${PATH}:${KAFKA_HOME}/bin
+RUN apk add --update unzip wget curl docker jq coreutils
 
-COPY broker-list.sh \
-    create-topics.sh \
-    start-kafka.sh \
-    start-kafkaOrMirrorMaker.sh \
-    start-mirrormaker.sh \
-    /usr/bin/ 
+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.p12 /tmp/org.onap.dmaap.mr.p12
+ADD keyfilenew /tmp/keyfilenew
+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
 
-COPY mmagent.config \
-    consumer.properties \
-    producer.properties \
-    /opt/etc/
+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
 
-COPY cadi.properties \
-    download-kafka.sh \
-    kafka_server_jaas.conf \
-    kafka-run-class.sh \
-    keyfilenew \
-    org.onap.dmaap.mr.p12 \
-    truststoreONAPall.jks \
-    kafka11aaf-jar-with-dependencies.jar \
-    dmaapMMAgent.jar \
-    /tmp/
+VOLUME ["/kafka"]
 
-RUN apk add --update bash unzip wget curl docker jq coreutils && \
-    chmod a+x /usr/bin/start-kafka.sh && \
+ENV KAFKA_HOME /opt/kafka
+ENV PATH ${PATH}:${KAFKA_HOME}/bin
+ADD start-kafka.sh /usr/bin/start-kafka.sh
+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
+# 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 && \
-    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
-    
-
-WORKDIR /usr/bin
-CMD ["start-kafkaOrMirrorMaker.sh"]
\ No newline at end of file
+    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"]
-- 
2.16.6