From 4ddb1e9253f563fe488b0339e0d9eb02004fb2da Mon Sep 17 00:00:00 2001
From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Mon, 29 Jun 2020 09:59:57 +0200
Subject: add java 11 alpine image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'opendaylight/sodium/sodium-alpine/src')

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/
-- 
cgit