summaryrefslogtreecommitdiffstats
path: root/opendaylight
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2020-06-29 09:59:57 +0200
committerMichael Dürre <michael.duerre@highstreet-technologies.com>2020-06-29 10:00:12 +0200
commit4ddb1e9253f563fe488b0339e0d9eb02004fb2da (patch)
tree644bad141789d21e678f9e7f2fa24cf672e380bf /opendaylight
parenteebf17072956de4713848115d23263cc24be110f (diff)
add java 11 alpine image
parallel alpine image with java 11 installed Issue-ID: CCSDK-2484 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com> Change-Id: Ia20a2175ee623f2400327b9fc25265c464780e65
Diffstat (limited to 'opendaylight')
-rw-r--r--opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile7
1 files changed, 2 insertions, 5 deletions
diff --git a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile
index be35e54f..ba64a4b7 100644
--- a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile
@@ -1,10 +1,7 @@
-FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version}
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight/current
-# make python2 also available up until OpenDaylight migrates to python3
-RUN apk add --no-cache py2-pip
+ENV ODL_HOME /opt/opendaylight/current
# copy the opendaylight tar and expand
COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/