summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-02-05 17:39:33 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-05 17:39:33 +0000
commitae6bf3aece73c084ca68c94ea030e88c6a8c5724 (patch)
tree46cb190786d88affda7c542dcfb0dbf785982726
parent0e1fcbcd4e73fc64f21b5a29bda4cf106df7154d (diff)
parentf96d791136ca5810b7d91bb5369c0a930d1055e1 (diff)
Merge "INT-814 & 819 small, multi-cpu image"
Former-commit-id: c7c3656f582d4bb6720b10b70bbb3986986d8e67
-rw-r--r--installation/ueb-listener/pom.xml4
-rw-r--r--installation/ueb-listener/src/main/docker/Dockerfile6
2 files changed, 5 insertions, 5 deletions
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 920c6e3a..80c31693 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -198,7 +198,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>
@@ -207,7 +207,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/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 28676fac..0ff773d9 100644
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
+# Base alpine with added packages needed for open ecomp
+FROM onap/ccsdk-alpine-image:${ccsdk.docker.version}
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties