revert the changes for small,multi-platform images5.0.2-ONAPelalto

Issue-ID: DMAAP-1272
Change-Id: I5b307099dfa2f2927ceb0c6bc2c9b8c253eb5995
Signed-off-by: su622b <su622b@att.com>

4 files changed, 116 insertions, 130 deletions

diff --git a/pom.xml b/pom.xml
index 072d69f..3c0a3d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!-- ============LICENSE_START======================================================= 
 	org.onap.dmaap ================================================================================ 
-	Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
+	Copyright © 2017 AT&T Intellectual Property. 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 
@@ -21,7 +21,7 @@
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
@@ -39,16 +39,6 @@
 	</developers>
 
 	<build>
-	<!-- Copy files to docker-stage to be included in image -->        
-        <resources>
-            <resource>
-                <targetPath>${basedir}/target/docker-stage</targetPath>
-                <directory>${basedir}/src/main/docker</directory>
-                    <includes>
-                        <include>*</include>
-                    </includes>
-            </resource>
-        </resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -159,32 +149,97 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
-                  		<artifactId>maven-resources-plugin</artifactId>
-		                  <version>2.7</version>
-                		  <executions>
-		                     <execution>
-                		          <id>copy-jar</id>
-		                          <phase>install</phase>
-                		          <goals>
-		                              <goal>copy-resources</goal>
-                		          </goals>
-		                          <configuration>
-                		              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-		                              <resources>
-		                                  <resource>
-		                                      <directory>${basedir}/target</directory>
-		                                      <includes>
-		                                          <include>dmaapMMAgent.jar</include>
-		                                          <include>kafka11aaf-jar-with-dependencies.jar</include>
-		                                      </includes>
-		                                  </resource>
-		                              </resources>
-		                          </configuration>
-		                      </execution>
-		                  </executions>
-		       	</plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<imageName>onap/dmaap/kafka111</imageName>
+					<dockerDirectory>src/main/docker</dockerDirectory>
+					<serverId>docker-hub</serverId>
+					<imageTags>
+						<imageTag>${dockertag1}</imageTag>
+						<imageTag>${dockertag2}</imageTag>
+					</imageTags>
+					<resources>
+						<!-- <resource> <targetPath>/</targetPath> <directory>${dockerLocation}</directory> 
+							<include>${project.build.finalName}.jar</include> </resource> -->
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>**/**</include>
+						</resource>
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>dmaapMMAgent.jar</include>
+						</resource>
+					</resources>
+				</configuration>
+				<executions>
+					<execution>
+						<id>build-image</id>
+						<phase>install</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+						<configuration>
+							<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>tag-image-project-version</id>
+						<phase>install</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/dmaap/kafka111</image>
+							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>tag-image-latest</id>
+						<phase>install</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/dmaap/kafka111</image>
+							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>push-image</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>push-image-latest</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -326,52 +381,10 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- build docker image -->
-                    			<plugin>
-			                      <groupId>io.fabric8</groupId>
-			                      <artifactId>docker-maven-plugin</artifactId>
-			                      <version>0.28.0</version>
-				                      <configuration>
-			                          <verbose>${docker.verbose}</verbose>
-			                          <apiVersion>${docker.apiVersion}</apiVersion>
-			                          <pullRegistry>${docker.pull.registry}</pullRegistry>
-                        			  <pushRegistry>${docker.push.registry}</pushRegistry>
-			                          <images>
-			                              <image>
-			                                  <name>onap/dmaap/kafka111</name>
-			                                  <build>
-			                                      <cleanup>try</cleanup>
-			                                     <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-			                                     <dockerFile>Dockerfile</dockerFile>
-			                                      <tags>
-			                                          <tag>${dockertag1}</tag>
-			                                          <tag>${dockertag2}</tag>
-			                                      </tags>
-			                                  </build>
-			                              </image>
-			                          </images>
-			                      </configuration>
-			                      <executions>
-			                          <execution>
-			                              <id>generate-images</id>
-			                              <phase>install</phase>
-			                              <goals>
-			                                  <goal>build</goal>
-			                              </goals>
-			                          </execution>
-			                          <execution>
-			                              <id>push-images</id>
-			                              <phase>deploy</phase>
-			                              <goals>
-			                                  <goal>push</goal>
-			                              </goals>
-			                          </execution>
-			                      </executions>
-			                   </plugin>
 				</plugins>
 			</build>
 		</profile>
 
 	</profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index d5ce240..c330691 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,48 +1,24 @@
-FROM alpine:3.7
-
-ENV LANG C.UTF-8
-
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-RUN { \
-		echo '#!/bin/sh'; \
-		echo 'set -e'; \
-		echo; \
-		echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
-	} > /usr/local/bin/docker-java-home \
-	&& chmod +x /usr/local/bin/docker-java-home
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
-ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
-
-ENV JAVA_VERSION 8u212
-ENV JAVA_ALPINE_VERSION 8.212.04-r0
-
-RUN set -x \
-	&& apk add --no-cache \
-		openjdk8-jre="$JAVA_ALPINE_VERSION" \
-	&& [ "$JAVA_HOME" = "$(docker-java-home)" ]
+FROM anapsix/alpine-java
 
 ARG kafka_version=1.1.1
 ARG scala_version=2.12
 
-RUN apk add --no-cache unzip wget docker curl jq coreutils libstdc++ ca-certificates bash java-cacerts
 
-ENV KAFKA_VERSION=$kafka_version SCALA_VERSION=$scala_version
+RUN apk add --update unzip wget curl docker jq coreutils
 
-COPY download-kafka.sh \
-     kafka_server_jaas.conf \
-     org.onap.dmaap.mr.trust.jks \
-     org.onap.dmaap.mr.p12 \
-     org.onap.dmaap.mr.keyfile \
-     cadi.properties \
-     kafka11aaf-jar-with-dependencies.jar \
-     dmaapMMAgent.jar \
-     kafka-run-class.sh \
-     /tmp/
-
-COPY mmagent.config \
-     consumer.properties \
-     producer.properties \
-     /opt/etc/
+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 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 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
 
@@ -50,14 +26,11 @@ VOLUME ["/kafka"]
 
 ENV KAFKA_HOME /opt/kafka
 ENV PATH ${PATH}:${KAFKA_HOME}/bin
-
-COPY start-kafka.sh \
-     broker-list.sh \
-     create-topics.sh \
-     start-kafkaOrMirrorMaker.sh \
-     start-mirrormaker.sh \
-     /usr/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
 RUN mkdir /opt/logs
 RUN touch /opt/logs/mmagent.log
 # The scripts need to have executable permission
@@ -73,4 +46,4 @@ 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
+USER mrkafka
\ No newline at end of file
diff --git a/src/main/docker/cadi.properties b/src/main/docker/cadi.properties
index 7f5a60f..a63a1bf 100644
--- a/src/main/docker/cadi.properties
+++ b/src/main/docker/cadi.properties
@@ -1,5 +1,5 @@
 #aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 aaf_env=DEV
 aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
 
diff --git a/version.properties b/version.properties
index f3d89cc..5a3fe66 100644
--- a/version.properties
+++ b/version.properties
@@ -26,7 +26,7 @@
 
 major=1
 minor=0
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}