From e72ff8190ecf5eea8ea6d938c37b78ffe545da47 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 14 Feb 2023 11:34:52 +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: Idf5c1565fd74b17bcabc137f5292ebc097c3d246 Signed-off-by: liamfallon --- .../policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile | 3 ++- packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile | 3 ++- .../policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile | 3 ++- .../policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile | 3 ++- .../src/main/docker/KubernetesParticipant.Dockerfile | 3 ++- .../policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'packages/policy-clamp-docker/src') diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile index 9f393107c..ff08d8ee1 100755 --- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/a1pms-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile index 3f36f3d36..c77f48b5d 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/policy-clamp-runtime-acm ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile index 0a92cee2e..adfa00d59 100644 --- a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2022 Nordix Foundation. +# 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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/element-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile index 17dccaa1d..720927bfc 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/http-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_LOGS $POLICY_HOME && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile index 1395a678c..72250e8af 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/k8s-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile index fe08785e6..c82754b17 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2021-2022 Nordix Foundation. +# Copyright (C) 2021-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. @@ -40,6 +40,7 @@ ARG POLICY_LOGS=/var/log/onap/policy/pf-participant ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/clamp +USER root RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS -- cgit 1.2.3-korg