Update policy-xacml-pdp for java11 docker

Issue-ID: POLICY-1586
Change-Id: I6ff51d191a506297cbe69161114c0721b59bb5d2
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index 1efc072..63a1513 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/policy-common-alpine:1.4.0
+FROM onap/policy-jre-debian
 
 LABEL maintainer="Policy Team"
 
@@ -7,7 +7,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/pdpx
 ENV POLICY_LOGS=$POLICY_LOGS
 
 ENV POLICY_HOME=$POLICY_HOME/pdpx
-RUN apk add --no-cache mariadb-client
+RUN apt-get install -y mariadb-client
 RUN mkdir -p $POLICY_HOME $POLICY_LOGS $POLICY_HOME/etc/ssl $POLICY_HOME/bin $POLICY_HOME/apps && \
     chown -R policy:policy $POLICY_HOME $POLICY_LOGS && mkdir /packages
 

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
index f00b7ad..a877387 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
@@ -19,7 +19,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/
+JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
 KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore"
 KEYSTORE_PASSWD="Pol1cy_0nap"
 TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore"