summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-03-25 18:04:18 -0400
committerJim Hahn <jrh3@att.com>2021-03-26 12:26:26 -0400
commit516b0a8287a70500e1c68c13afb264d20af5efeb (patch)
tree47fbc300b7cf32abacc855708b3fa8202336ca04
parent39b7b9897494d9f14ca196c8f0e2f0bc7e57cf4f (diff)
Use base image for policy-jdk docker images
Couldn't figure out a way to remove the jre, but was able to install the jdk over top of it. Issue-ID: POLICY-3134 Change-Id: I6096ff765500977f58449800192bbf2b53848efa Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--policy-jdk/alpine/src/main/docker/Dockerfile16
-rw-r--r--policy-jre/alpine/src/main/docker/Dockerfile7
2 files changed, 11 insertions, 12 deletions
diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile
index 2f64d8ed..e56fd95c 100644
--- a/policy-jdk/alpine/src/main/docker/Dockerfile
+++ b/policy-jdk/alpine/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Tieto. All rights reserved.
-# Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2020 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,17 +23,19 @@
# $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk
# more details at https://hub.docker.com/_/openjdk
-FROM alpine:3.12.0
+FROM onap/integration-java11:8.0.0
LABEL maintainer="Policy Team"
ENV POLICY_HOME=/opt/app/policy
-#
-# When these are done via a single "RUN", I/O errors occur sporadically,
-# thus they have been split into separate RUNs.
-#
-RUN apk update \
+USER root
+
+RUN rm -rf /opt/java/openjdk \
+ && mkdir /opt/java/openjdk \
+ && mkdir -p /usr/lib/jvm/ \
+ && ln -s /opt/java/openjdk /usr/lib/jvm/java-11-openjdk \
+ && apk update \
&& apk add --no-cache \
busybox-extras \
curl \
diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile
index ec950d72..20e74134 100644
--- a/policy-jre/alpine/src/main/docker/Dockerfile
+++ b/policy-jre/alpine/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Tieto. All rights reserved.
-# Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2020 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,10 +30,7 @@ LABEL maintainer="Policy Team"
ENV POLICY_HOME=/opt/app/policy
USER root
-#
-# When these are done via a single "RUN", I/O errors occur sporadically,
-# thus they have been split into separate RUNs.
-#
+
RUN apk update \
&& apk add --no-cache \
busybox-extras \