From 78d7bb2bacba6b2faff8cf27cd518ad501a80568 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 15 Jan 2020 16:45:49 -0500 Subject: [PATCH] Update policy-pap for java11 docker Issue-ID: POLICY-1586 Signed-off-by: Jim Hahn Change-Id: Ib45beaaee2db6e290d6219db9006042885ed3525 --- packages/policy-pap-docker/src/main/docker/Dockerfile | 2 +- packages/policy-pap-docker/src/main/docker/policy-pap.sh | 2 +- .../stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/policy-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile index 4b0892c2..99661d20 100644 --- a/packages/policy-pap-docker/src/main/docker/Dockerfile +++ b/packages/policy-pap-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" diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh index 3b27432f..d6058001 100644 --- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh +++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh @@ -20,7 +20,7 @@ # ============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" diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh index 262f77cc..40c0fa2b 100644 --- a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh +++ b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh @@ -20,7 +20,7 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ +JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ POLICY_PAP_HOME=/opt/app/policy/pap KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" -- 2.16.6