summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsandovalfr <frank.sandoval@oamtechnologies.com>2019-01-28 13:16:57 -0700
committersandovalfr <frank.sandoval@oamtechnologies.com>2019-01-28 13:17:51 -0700
commit6743641a68af18c96014714227643cc0d7c147d5 (patch)
tree67e6bf1f361da4f6fe22bceb419b70366bbca149
parenta5408b1bdefc1fbfe5d235204dd01512697430b5 (diff)
INT-812 and 817, small, multi-arch images
Issue-ID: INT-817 Change-Id: I282356169901d7d5f4ad162695cb76bd10138eeb Signed-off-by: sandovalfr <frank.sandoval@oamtechnologies.com> Former-commit-id: 0df7aa33a5ffba852632737b171f8406ec3d97f2
-rw-r--r--installation/dmaap-listener/pom.xml4
-rw-r--r--installation/dmaap-listener/src/main/docker/Dockerfile19
2 files changed, 18 insertions, 5 deletions
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 1be5d881..d0c235f5 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -197,7 +197,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>
@@ -206,7 +206,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/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile
index 28676fac..71f2eca4 100644
--- a/installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/installation/dmaap-listener/src/main/docker/Dockerfile
@@ -1,9 +1,22 @@
# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
+FROM alpine:3.8
+
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+
+RUN apk update && apk add \
+ bash \
+ git \
+ openjdk8 \
+ maven \
+ mysql-client \
+ nodejs \
+ py-pip \
+ graphviz \
+ unzip \
+ rsync
# copy deliverables to opt
COPY opt /opt