From 755eb9df282d80273043a2e902e2a51bf6eaab24 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Wed, 22 Jan 2020 12:11:11 +0000
Subject: Run apex-pdp in Java 11: base changes

This change brings in the minimum changes to get apex-pdp running in
Java 11. Other reviews will bring in changes to remove Java 11 warnings
and to convert apex-pdp Javascript handling from the now deprecated
nashorn engine.

Issue-ID: POLICY-1581
Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 .../apex-pdp-docker/src/main/docker/Dockerfile     | 55 +++++++++++++---------
 1 file changed, 33 insertions(+), 22 deletions(-)

(limited to 'packages/apex-pdp-docker/src/main/docker/Dockerfile')

diff --git a/packages/apex-pdp-docker/src/main/docker/Dockerfile b/packages/apex-pdp-docker/src/main/docker/Dockerfile
index 7f208dac3..c2b9c1e94 100644
--- a/packages/apex-pdp-docker/src/main/docker/Dockerfile
+++ b/packages/apex-pdp-docker/src/main/docker/Dockerfile
@@ -1,7 +1,27 @@
+#-------------------------------------------------------------------------------
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2020 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Docker file to build an image that runs APEX on Java 8 in alpine
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-FROM onap/policy-base-alpine:1.4.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#-------------------------------------------------------------------------------
+
+#
+# Docker file to build an image that runs APEX on Java 11 or better in alpine
+#
+FROM onap/policy-jre-alpine
 
 LABEL maintainer="Policy Team"
 
@@ -10,31 +30,22 @@ ENV POLICY_HOME=/opt/app/policy/apex-pdp
 ENV POLICY_LOGS=$POLICY_LOGS
 
 RUN apk add --no-cache \
-    vim \
-    iproute2 \
-    iputils
-
-# Create apex user and group
-RUN addgroup -S apexuser && adduser -S apexuser -G apexuser
-
-# Add Apex-specific directories and set ownership as the Apex admin user
-RUN mkdir -p $POLICY_HOME \
+        vim \
+        iproute2 \
+        iputils \
+    && addgroup -S apexuser && adduser -S apexuser -G apexuser \
+    && mkdir -p $POLICY_HOME \
     && mkdir -p $POLICY_LOGS \
-    && chown -R apexuser:apexuser $POLICY_LOGS
+    && chown -R apexuser:apexuser $POLICY_LOGS \
+    && mkdir /packages
 
-# Unpack the tarball
-RUN mkdir /packages
 COPY /maven/apex-pdp-package-full.tar.gz /packages
 RUN tar xvfz /packages/apex-pdp-package-full.tar.gz --directory $POLICY_HOME \
-    && rm /packages/apex-pdp-package-full.tar.gz
-
-# Ensure everything has the correct permissions
-RUN find /opt/app -type d -perm 755 \
+    && rm /packages/apex-pdp-package-full.tar.gz \
+    && find /opt/app -type d -perm 755 \
     && find /opt/app -type f -perm 644 \
-    && chmod 755 $POLICY_HOME/bin/*
-
-# Copy examples to Apex user area and make apexuser as the owner for files in POLICY_HOME
-RUN cp -pr $POLICY_HOME/examples /home/apexuser \
+    && chmod 755 $POLICY_HOME/bin/* \
+    && cp -pr $POLICY_HOME/examples /home/apexuser \
     && chown -R apexuser:apexuser /home/apexuser/* $POLICY_HOME \
     && chmod 755 $POLICY_HOME/etc/*
 
-- 
cgit 1.2.3-korg