From f937804befdaee977269704b506944df2b5de39a Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Tue, 14 Feb 2023 11:34:22 +0000
Subject: Update Dockerfile for PF base image

The Policy Framework base image run under the "onap" user rather than
under the "root" user. This means that root access has to be enabled in
child Dockerfiles for configuraiton that requires root access.

Root access is turned off again later in the Dockerfile so that the
image will run under another user.

Issue-ID: POLICY-4558
Change-Id: I7245db2d485e72d130008155999242e15e60d611
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile | 3 ++-
 models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
index 433c95eb6..f6007af85 100644
--- a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
+++ b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
@@ -4,7 +4,7 @@
 # ================================================================================
 # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
-# Modifications Copyright (C) 2022 Nordix Foundation.
+# Modifications Copyright (C) 2022-2023 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/simulators
 ENV POLICY_LOGS=$POLICY_LOGS
 ENV POLICY_HOME=$POLICY_HOME/simulators
 
+USER root
 RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \
     chown -R policy:policy $POLICY_HOME $POLICY_LOGS
 
diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile
index ae835693b..ec8fe6fda 100644
--- a/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile
+++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/Dockerfile
@@ -1,6 +1,6 @@
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019-2021 Nordix Foundation.
+#  Copyright (C) 2019-2021,2023 Nordix Foundation.
 #  Modifications Copyright (C) 2019 AT&T Intellectual Property.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,6 +34,7 @@ ENV POLICY_LOGS=${POLICY_LOGS}
 
 # Create PDP simulator user and group
 # Add simulator-specific directories and set ownership as the simulator user
+USER root
 RUN mkdir -p ${POLICY_HOME}/pdp-sim \
     && mkdir -p ${POLICY_HOME}/pdp-sim/bin \
     && mkdir -p ${POLICY_LOGS} \
-- 
cgit 1.2.3-korg