updated circinus builder to refuse to run as root

3 files changed, 15 insertions, 2 deletions

diff --git a/new/image_builder.py b/new/image_builder.py
index 23baccd..3d99975 100755
--- a/new/image_builder.py
+++ b/new/image_builder.py
@@ -13,7 +13,7 @@ from time import monotonic
 import netifaces
 
 from lib.git import Git
-from lib.helpers import setup_logging, execute, quote_all, rmtree
+from lib.helpers import setup_logging, execute, quote_all, rmtree, refuse_root
 
 
 class ImageBuilder:
@@ -197,6 +197,8 @@ if __name__ == "__main__":
     setup_logging()
 
     try:
+        refuse_root()
+
         parser = argparse.ArgumentParser()
         parser.add_argument("branch", help="VyOS branch (current, circinus)")
         parser.add_argument("--vyos-build-git", default="https://github.com/vyos/vyos-build.git",
diff --git a/new/lib/helpers.py b/new/lib/helpers.py
index 2d84e1a..d2ea3f4 100644
--- a/new/lib/helpers.py
+++ b/new/lib/helpers.py
@@ -1,4 +1,5 @@
 import logging
+import os
 import shlex
 import shutil
 import subprocess
@@ -65,3 +66,11 @@ def setup_logging():
     console.setLevel(logging.INFO)
     console.setFormatter(formatter)
     logger.addHandler(console)
+
+def refuse_root():
+    if os.getuid() == 0:
+        logging.error(
+            "ERROR: 'root' user detected, please don't run this script as root,"
+            " run as any other regular user that has docker access (usermod -aG docker YOUR_USER),"
+            " the root privileges would break some packages.")
+        exit(1)
\ No newline at end of file
diff --git a/new/package_builder.py b/new/package_builder.py
index b9b2c74..3f01520 100755
--- a/new/package_builder.py
+++ b/new/package_builder.py
@@ -11,7 +11,7 @@ from lib.apt import Apt
 from lib.cache import Cache
 from lib.git import Git
 from lib.github import GitHub
-from lib.helpers import setup_logging, quote_all, execute, ProcessException, rmtree
+from lib.helpers import setup_logging, quote_all, execute, ProcessException, rmtree, refuse_root
 
 
 class Builder:
@@ -195,6 +195,8 @@ if __name__ == "__main__":
     setup_logging()
 
     try:
+        refuse_root()
+
         parser = argparse.ArgumentParser()
         parser.add_argument("branch", help="VyOS branch (current, circinus)")
         parser.add_argument("--single-package", help="Build only this package")