INT-813 818, small multi-CPU images

Issue-ID: INT-813

Change-Id: Icc64c9563463c901277e9e0253d00c059fc1041d
Signed-off-by: sandovalfr <frank.sandoval@oamtechnologies.com>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index ed84080..9c69c9e 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -95,7 +95,7 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.16.5</version>
+                               <version>0.28.0</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <images>
@@ -104,7 +104,7 @@
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                               <dockerFile>Dockerfile</dockerFile>
                                                                <tags>
                                                                        <tag>${project.version}</tag>
                                                                        <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index f424238..3565ff7 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -3,7 +3,8 @@ FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
 
 MAINTAINER SDN-C Team (sdnc@lists.onap.org)
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+#ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV ODL_HOME /opt/opendaylight/current
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores