From fa73330ee40a5c7f409324015238ec34cfa396d0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 15 Jan 2020 17:58:19 -0500 Subject: Update drools-pdp for java11 docker Issue-ID: POLICY-1586 Signed-off-by: Jim Hahn Change-Id: I8a69268bf240e267a0a693992112707a4d503b73 --- packages/docker/src/main/docker/Dockerfile | 6 ++---- packages/install/src/files/base.conf | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index d2fbf471..935ea645 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-common-alpine:1.4.0 +FROM onap/policy-jdk-debian LABEL maintainer="Policy Team" @@ -14,12 +14,10 @@ ENV POLICY_CONFIG $POLICY_HOME/config ENV POLICY_LOGBACK $POLICY_CONFIG/logback.xml ENV POLICY_DOCKER true -RUN apk add --no-cache \ +RUN apt-get install -y \ mariadb-client \ file \ bash-completion \ - openssl \ - less \ vim \ && pip install http-prompt diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index 28591d47..6d80fb56 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -26,7 +26,7 @@ JVM_OPTIONS=-server -Xms512m -Xmx1024m POLICY_HOME=/opt/app/policy POLICY_LOGS=/opt/app/policy/logs -JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +JAVA_HOME=/usr/lib/jvm/java-11-openjdk KEYSTORE_PASSWD=Pol1cy_0nap TRUSTSTORE_PASSWD=Pol1cy_0nap -- cgit 1.2.3-korg