diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-11-04 13:08:21 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-11-04 13:08:21 -0500 |
| commit | be9c4ac3e4723913ba37f2acc11a14e77165b332 (patch) | |
| tree | ec356bbb6a7b05b2d499e1993e9c94faa3490943 | |
| parent | c84a5266fc2ab31cb2bb68927457f6cdbb40c0b3 (diff) | |
Update dmaap-listener and ueb-listener to use java11
Updated dmaap-listener and ueb-listener to use java 11 JRE instead
of java 8. Also updated dmaap-listener to use ONAP standard
base image
Change-Id: I7c568cc6f9e9a27b7c4028a01e3a7c41a3130a63
Issue-ID: SDNC-1352
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: e2992cfd8358b961e9cf3126d33a8a8b6643931b
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 2 | ||||
| -rw-r--r-- | installation/dmaap-listener/src/main/docker/Dockerfile | 9 | ||||
| -rw-r--r-- | installation/ueb-listener/src/main/docker/Dockerfile | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 33e7a66f..3cc271f7 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -23,7 +23,7 @@ <image.name>onap/sdnc-dmaap-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version> + <ccsdk.docker.version>1.1-STAGING-latest</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index df444e0a..d7c8fa7f 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -1,7 +1,6 @@ # Base ubuntu with added packages needed for open ecomp -FROM alpine:3.8 AS stage0 +FROM onap/ccsdk-alpine-j11-image:${ccsdk.docker.version} AS stage0 -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties # copy deliverables to opt @@ -9,22 +8,20 @@ COPY opt /opt # End of stage 0 -FROM alpine:3.8 +FROM onap/ccsdk-alpine-j11-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties USER root RUN apk update && apk add \ bash \ git \ - openjdk8 \ maven \ mysql-client \ nodejs \ - py-pip \ + py3-pip \ graphviz \ unzip \ rsync diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index daecd1cc..4f34a0d9 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,7 +1,6 @@ # Base alpine with added packages needed for open ecomp FROM onap/ccsdk-alpine-image:${ccsdk.docker.version} AS stage0 -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties @@ -13,7 +12,6 @@ COPY opt /opt FROM onap/ccsdk-alpine-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties USER root |