From f2e7b59311c80c099d405c1c8d23b58c8046571d Mon Sep 17 00:00:00 2001 From: sandovalfr Date: Wed, 30 Jan 2019 15:45:31 -0700 Subject: INT-813 818, small multi-CPU images Issue-ID: INT-813 Change-Id: Icc64c9563463c901277e9e0253d00c059fc1041d Signed-off-by: sandovalfr Former-commit-id: 96aa089f6dd9da04f241c0d1077ffb2095a101fb --- installation/sdnc/pom.xml | 4 ++-- installation/sdnc/src/main/docker/Dockerfile | 3 ++- 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 @@ io.fabric8 docker-maven-plugin - 0.16.5 + 0.28.0 false @@ -104,7 +104,7 @@ try ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile + Dockerfile ${project.version} ${project.version}-STAGING-${maven.build.timestamp} 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 -- cgit 1.2.3-korg