summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-07-14 12:26:55 -0400
committerJim Hahn <jrh3@att.com>2021-07-14 16:53:37 +0000
commit614af0ea4b6aa450726b491444d1ef52070ca52d (patch)
treec30c623ecd443e900396f802f945021d28751540
parent39f68e0f3e0a0442b2ddf4593c33a2e483fc1822 (diff)
Base policy-jdk image on onap-python image
The onap-java image only installs the java jre, but policy needs the jdk, thus we have been uninstalling the jre and then installing the jdk. Unfortunately, this means that the policy-jdk image does not use the latest ONAP-specified point release for either the java jdk OR python. With this change, the policy-jdk image will start with the onap-python image instead, thus python, at least will be up to date, even if the jdk is not. Note: tried using the latest adoptjdk image, but apparently there's something different about that image that triggers a stack overflow in apex-pdp. Consequently, we'll stay with the openjdk installed via alpine "apk". This is still java 11, which satisfies ONAP requirements, it just isn't the point release that is preferred. Issue-ID: POLICY-3486 Change-Id: I0959c7048a38e30927b37b58deb887cc961a2150 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--policy-jdk/alpine/src/main/docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile
index 4cc3ef75..7f8fd91b 100644
--- a/policy-jdk/alpine/src/main/docker/Dockerfile
+++ b/policy-jdk/alpine/src/main/docker/Dockerfile
@@ -23,7 +23,7 @@
# $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk
# more details at https://hub.docker.com/_/openjdk
-FROM onap/integration-java11:9.0.0
+FROM onap/integration-python:9.1.0
LABEL maintainer="Policy Team"
@@ -32,7 +32,7 @@ ENV POLICY_HOME=/opt/app/policy
USER root
RUN rm -rf /opt/java/openjdk \
- && mkdir /opt/java/openjdk \
+ && mkdir -p /opt/java/openjdk \
&& mkdir -p /usr/lib/jvm/ \
&& ln -s /opt/java/openjdk /usr/lib/jvm/java-11-openjdk \
&& apk update \