From 7986278926ed0206822760c5ea9c74feb92c5e68 Mon Sep 17 00:00:00 2001
From: Maksym Buz <buz.maxim@gmail.com>
Date: Thu, 4 Sep 2025 14:50:19 +0200
Subject: [PATCH] TEST: Build script is now in Dockerfile

---
 zabbix-apk-builder/.gitignore |  1 +
 zabbix-apk-builder/Dockerfile | 25 ++++++++++++++++++++++++-
 zabbix-apk-builder/build.sh   | 17 ++---------------
 3 files changed, 27 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 zabbix-apk-builder/build.sh

diff --git a/zabbix-apk-builder/.gitignore b/zabbix-apk-builder/.gitignore
index 327d344..dd55924 100644
--- a/zabbix-apk-builder/.gitignore
+++ b/zabbix-apk-builder/.gitignore
@@ -9,6 +9,7 @@ src/
 
 # Backup files
 *.backup
+*.bak
 *~
 
 # OS files
diff --git a/zabbix-apk-builder/Dockerfile b/zabbix-apk-builder/Dockerfile
index a8a5573..8058005 100644
--- a/zabbix-apk-builder/Dockerfile
+++ b/zabbix-apk-builder/Dockerfile
@@ -36,5 +36,28 @@ COPY --chown=builder:builder . /home/builder/zabbix/
 
 WORKDIR /home/builder/zabbix
 
+# Create build script
+USER root
+RUN cat > /usr/local/bin/build-and-copy.sh << 'EOF'
+#!/bin/sh
+set -e
+
+echo "Building packages as builder user..."
+sudo -u builder sh -c "
+    cd /home/builder/zabbix
+    abuild checksum
+    abuild -r
+"
+
+echo "Copying packages to output..."
+find /home/builder/packages -name '*.apk' -exec cp {} /output/ \;
+chmod 644 /output/*.apk
+
+echo "Build complete! Packages:"
+ls -la /output/
+EOF
+
+RUN chmod +x /usr/local/bin/build-and-copy.sh
+
 # Set build command
-CMD ["abuild", "-r"]
+CMD ["/usr/local/bin/build-and-copy.sh"]
\ No newline at end of file
diff --git a/zabbix-apk-builder/build.sh b/zabbix-apk-builder/build.sh
old mode 100755
new mode 100644
index 5fcdb16..e0ac75a
--- a/zabbix-apk-builder/build.sh
+++ b/zabbix-apk-builder/build.sh
@@ -32,21 +32,8 @@ echo "Running package build..."
 docker run --rm \
     --name "$CONTAINER_NAME" \
     -v "$OUTPUT_DIR:/output" \
-    "$IMAGE_NAME" \
-    sh -c "
-        set -e
-        echo 'Starting package build...'
-        
-        # Generate checksums for APKBUILD
-        abuild checksum
-        
-        # Build packages
-        abuild -r
-        
-        # Copy packages to output
-        echo 'Copying packages to output directory...'
-        find /home/builder/packages -name '*.apk' -exec cp {} /output/ \;
-    "
+    "$IMAGE_NAME"
+
 echo "Build completed successfully!"
 echo "To install packages:"
 echo "  apk add --allow-untrusted $OUTPUT_DIR/zabbix-agent-*.apk"