From: Taka Cho <takamune.cho@att.com>
Date: Fri, 18 Dec 2020 14:42:52 +0000 (-0500)
Subject: use java11 jre base from onap
X-Git-Tag: 2.2.0^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F116481%2F1;p=policy%2Fdocker.git

use java11 jre base from onap

1, use onap/integration-java11 as a base for JRE
2, sym-link to the original JAVA_HOME to ensure
   all startup scripts worked

Issue-ID: POLICY-2917
Change-Id: I2c8333f227f8ae2076a6c784cf344db8fb59345b
Signed-off-by: Taka Cho <takamune.cho@att.com>
---

diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile
index bf905368..ec950d72 100644
--- a/policy-jre/alpine/src/main/docker/Dockerfile
+++ b/policy-jre/alpine/src/main/docker/Dockerfile
@@ -23,12 +23,13 @@
 # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk
 # more details at https://hub.docker.com/_/openjdk
 
-FROM alpine:3.12.0
+FROM onap/integration-java11:8.0.0
 
 LABEL maintainer="Policy Team"
 
 ENV POLICY_HOME=/opt/app/policy
 
+USER root
 #
 # When these are done via a single "RUN", I/O errors occur sporadically,
 # thus they have been split into separate RUNs.
@@ -41,8 +42,9 @@ RUN apk update \
         procps \
         unzip \
         zip \
-        openjdk11-jre \
     && addgroup -S policy \
     && adduser -S  --shell /bin/sh -G policy policy \
     && mkdir -p ${POLICY_HOME}/ \
-    && chown policy:policy ${POLICY_HOME}
+    && chown policy:policy ${POLICY_HOME} \
+    && mkdir -p /usr/lib/jvm/ \
+    && ln -s /opt/java/openjdk /usr/lib/jvm/java-11-openjdk