From ef34786c11c15152641ced97c5a9afe2a16510d0 Mon Sep 17 00:00:00 2001
From: Echo <echo@moon-dragon.us>
Date: Tue, 14 Apr 2026 00:05:14 +0000
Subject: [PATCH] Fix: Use non-root builduser for abuild in CI container

---
 build-alpine.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/build-alpine.sh b/build-alpine.sh
index 28e2777..de5b68d 100755
--- a/build-alpine.sh
+++ b/build-alpine.sh
@@ -63,11 +63,21 @@ EOF
 
 # Generate checksums for APKBUILD sources
 echo "Generating checksums..."
-abuild checksum
 
 # Build APK package
 echo "Building APK package..."
-abuild -F -r
+
+# For CI/container environments where we run as root, create a build user
+if [ "$(id -u)" = "0" ]; then
+    echo "Running as root - creating build user for abuild..."
+    adduser -D -s /bin/sh builduser 2>/dev/null || true
+    chown -R builduser:builduser "$(pwd)"
+    chown -R builduser:builduser /root/packages 2>/dev/null || true
+    su - builduser -c "cd $(pwd) && abuild checksum && abuild -F -r"
+else
+    abuild checksum
+    abuild -F -r
+fi
 
 # Copy to releases directory
 echo ""