summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-01-15 16:46:49 -0500
committerJim Hahn <jrh3@att.com>2020-01-15 17:02:49 -0500
commitcdedcbdd85bb5c0cd2db390c9d07924129f86ac2 (patch)
treebc27cc585c55584067eb664c466560b5fca95834
parent286940b8550ca41440196ac2ebd1e2d1fbd83821 (diff)
Update policy-xacml-pdp for java11 docker
Issue-ID: POLICY-1586 Change-Id: I6ff51d191a506297cbe69161114c0721b59bb5d2 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile4
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index 1efc072c..63a15138 100644
--- 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 f00b7adb..a8773877 100644
--- 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"