Re-add arm64 support changes

Re-adding some of the changes made to support arm64 that were lost in a
previous commit.

Commits that were lost:
b50d09cce12ac78b3f518a5e52ffa45cde259e70
04e6b061e130c40e92e3e45c8fd1355f3c99ac29
1227efa25a23815c7c943c5d50da561bf369cd5d

Change-Id: Iff90e4d0fde55a283c47b687254ea4b9da2814c3
Issue-ID: CIMAN-154
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>

diff --git a/pom.xml b/pom.xml
index 01ae1b8..493012f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -355,10 +355,17 @@
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>0.4.11</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>com.github.jnr</groupId>
+                                               <artifactId>jnr-unixsocket</artifactId>
+                                               <version>0.13</version>
+                                       </dependency>
+                               </dependencies>
                                <configuration>
                                        <verbose>true</verbose>
                                        <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                                       <imageName>onap/${project.artifactId}</imageName>
                                        <dockerDirectory>${docker.location}</dockerDirectory>
                                        <imageTags>
                                                <imageTag>latest</imageTag>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 70088ae..e4d89a4 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y software-properties-common
 ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
 RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
 ## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure