From be9c9bb86b6236db12567ad0a591c48e08137fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pont=C3=B3n=20Rodr=C3=ADguez?=
 <135843011+jpontongradiant@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:36:40 +0200
Subject: [PATCH] No-root (#276)

* No-root

* delete TO DO comment
---
 docs/open5gs-and-srsran-4g-usrp/config/mme.yaml | 3 ++-
 docs/open5gs-and-srsran-4g-usrp/epc.yaml        | 1 +
 docs/open5gs-and-srsran-4g/epc.yaml             | 1 +
 docs/open5gs-and-srsran-5g/config/smf.yaml      | 3 ++-
 docs/open5gs-and-srsran-5g/core.yaml            | 1 +
 docs/open5gs-and-ueransim/config/smf.yaml       | 3 ++-
 docs/open5gs-and-ueransim/ngc.yaml              | 1 +
 images/open5gs/Dockerfile                       | 8 ++++----
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/open5gs-and-srsran-4g-usrp/config/mme.yaml b/docs/open5gs-and-srsran-4g-usrp/config/mme.yaml
index 8fa9c2d..ef4f7d0 100644
--- a/docs/open5gs-and-srsran-4g-usrp/config/mme.yaml
+++ b/docs/open5gs-and-srsran-4g-usrp/config/mme.yaml
@@ -1,5 +1,6 @@
 logger:
-  file: /opt/open5gs/var/log/open5gs/mme.log
+  file:
+    path: /opt/open5gs/var/log/open5gs/mme.log
 #  level: info   # fatal|error|warn|info(default)|debug|trace
 
 global:
diff --git a/docs/open5gs-and-srsran-4g-usrp/epc.yaml b/docs/open5gs-and-srsran-4g-usrp/epc.yaml
index 8ad8329..9fdbf0b 100644
--- a/docs/open5gs-and-srsran-4g-usrp/epc.yaml
+++ b/docs/open5gs-and-srsran-4g-usrp/epc.yaml
@@ -34,6 +34,7 @@ services:
     restart : on-failure
   upf:
     image: gradiant/open5gs:2.7.1
+    user: root
     command: ["open5gs-upfd"]
     cap_add:
       - all
diff --git a/docs/open5gs-and-srsran-4g/epc.yaml b/docs/open5gs-and-srsran-4g/epc.yaml
index 2d32fc6..acb2a21 100644
--- a/docs/open5gs-and-srsran-4g/epc.yaml
+++ b/docs/open5gs-and-srsran-4g/epc.yaml
@@ -32,6 +32,7 @@ services:
     restart : on-failure
   upf:
     image: gradiant/open5gs:2.7.1
+    user: root
     command: ["open5gs-upfd"]
     cap_add:
       - all
diff --git a/docs/open5gs-and-srsran-5g/config/smf.yaml b/docs/open5gs-and-srsran-5g/config/smf.yaml
index 3737f5f..d23a387 100644
--- a/docs/open5gs-and-srsran-5g/config/smf.yaml
+++ b/docs/open5gs-and-srsran-5g/config/smf.yaml
@@ -1,5 +1,6 @@
 logger:
-  file: /opt/open5gs/var/log/open5gs/smf.log
+  file:
+    path: /opt/open5gs/var/log/open5gs/smf.log
 #  level: info   # fatal|error|warn|info(default)|debug|trace
 
 global:
diff --git a/docs/open5gs-and-srsran-5g/core.yaml b/docs/open5gs-and-srsran-5g/core.yaml
index 50b7218..e619962 100644
--- a/docs/open5gs-and-srsran-5g/core.yaml
+++ b/docs/open5gs-and-srsran-5g/core.yaml
@@ -69,6 +69,7 @@ services:
     
   upf:
     image: gradiant/open5gs:2.7.1
+    user: root
     command:
       - open5gs-upfd
     cap_add:
diff --git a/docs/open5gs-and-ueransim/config/smf.yaml b/docs/open5gs-and-ueransim/config/smf.yaml
index 3737f5f..d23a387 100644
--- a/docs/open5gs-and-ueransim/config/smf.yaml
+++ b/docs/open5gs-and-ueransim/config/smf.yaml
@@ -1,5 +1,6 @@
 logger:
-  file: /opt/open5gs/var/log/open5gs/smf.log
+  file:
+    path: /opt/open5gs/var/log/open5gs/smf.log
 #  level: info   # fatal|error|warn|info(default)|debug|trace
 
 global:
diff --git a/docs/open5gs-and-ueransim/ngc.yaml b/docs/open5gs-and-ueransim/ngc.yaml
index ff2963f..2f58064 100644
--- a/docs/open5gs-and-ueransim/ngc.yaml
+++ b/docs/open5gs-and-ueransim/ngc.yaml
@@ -74,6 +74,7 @@ services:
 
   upf:
     image: gradiant/open5gs:2.7.1
+    user: root
     command:
     - open5gs-upfd
     cap_add:
diff --git a/images/open5gs/Dockerfile b/images/open5gs/Dockerfile
index 148a697..c60d1bb 100644
--- a/images/open5gs/Dockerfile
+++ b/images/open5gs/Dockerfile
@@ -102,10 +102,10 @@ ENV PATH=${APP_ROOT}/bin:${PATH} HOME=${APP_ROOT}
 WORKDIR ${APP_ROOT}
 COPY entrypoint.sh /entrypoint.sh
 
-# TODO: run with non-root user
-#RUN groupadd -r open5gs && useradd --no-log-init -r -g open5gs open5gs
-#RUN chown -R open5gs:open5gs ${APP_ROOT}
-#USER open5gs
+#Run with non-root user
+RUN groupadd -r open5gs && useradd --no-log-init -r -g open5gs open5gs
+RUN chown -R open5gs:open5gs ${APP_ROOT}
+USER open5gs
 
 #Default CONF values
 ENV DB_URI=mongodb://mongo/open5gs