summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsandovalfr <frank.sandoval@oamtechnologies.com>2019-01-30 15:45:31 -0700
committersandovalfr <frank.sandoval@oamtechnologies.com>2019-01-30 15:45:39 -0700
commitf2e7b59311c80c099d405c1c8d23b58c8046571d (patch)
tree62622e25058229b9ec68d9009f6e5b190494d629
parent6743641a68af18c96014714227643cc0d7c147d5 (diff)
INT-813 818, small multi-CPU images
Issue-ID: INT-813 Change-Id: Icc64c9563463c901277e9e0253d00c059fc1041d Signed-off-by: sandovalfr <frank.sandoval@oamtechnologies.com> Former-commit-id: 96aa089f6dd9da04f241c0d1077ffb2095a101fb
-rw-r--r--installation/sdnc/pom.xml4
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile3
2 files changed, 4 insertions, 3 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index ed84080e..9c69c9eb 100644
--- 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 f424238b..3565ff7a 100755
--- 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