From: Arul.Nambi <arul.nambi@amdocs.com>
Date: Mon, 13 Aug 2018 14:43:06 +0000 (-0400)
Subject: Fixing the docker jenkins job
X-Git-Tag: 1.3.0~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fchamp.git;a=commitdiff_plain;h=e9aac8f967ff16fb9a4ce9cbb072e02fe713acd0

Fixing the docker jenkins job

Issue-ID: AAI-1449
Change-Id: I11e3636d0999d27935d09ef1ca2ba6270dcd7f20
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
---

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 14140c7..7286874 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -317,13 +317,6 @@ limitations under the License.
                 <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>
diff --git a/champ-service/src/main/docker/Dockerfile b/champ-service/src/main/docker/Dockerfile
index 9d31b19..1bd9bd2 100644
--- a/champ-service/src/main/docker/Dockerfile
+++ b/champ-service/src/main/docker/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update
 # Install and setup java8
 RUN apt-get update && apt-get install -y software-properties-common
 RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk--amd64
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure