From c2f834858cbdd8ed245540d7325a1ddd4eff9f78 Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Tue, 23 Apr 2024 21:13:45 -0400
Subject: [PATCH] Configure for rootless docker

---
 backend/build-docker.sh | 31 +++++++++++++++++++------------
 backend/entrypoint.sh   |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/backend/build-docker.sh b/backend/build-docker.sh
index 9736989..0643381 100755
--- a/backend/build-docker.sh
+++ b/backend/build-docker.sh
@@ -1,27 +1,34 @@
 #!/bin/bash
 
-echo "--- Rust version info ---"
+cd /backend
+
+echo "--- Debug info ---"
 rustup --version
 rustc --version
 cargo --version
 
-mkdir -p out
+id $USER
+stat /backend || exit 1
+stat /backend/out || exit 1
+
+echo $(uname -a) > /backend/out/version.txt
 
 echo "--- Building ryzenadj lib ---"
-git clone https://github.com/FlyGoat/RyzenAdj ryzenadj
-cd ryzenadj
-git checkout -q 160502771054d31d2f4c2fa46ad42c96336f3a74
+git clone https://github.com/FlyGoat/RyzenAdj /tmp/ryzenadj
+cd /tmp/ryzenadj
+git checkout -q v0.14.0
 mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release ..
-make
-mv libryzenadj.so ../../out/libryzenadj.so
-cd ../..
+cmake -DCMAKE_BUILD_TYPE=Release .. || exit 1
+make || exit 1
+mv libryzenadj.so /backend/out/libryzenadj.so || exit 1
+mv ryzenadj /backend/out/ryzenadj || exit 1
+cd /backend
 
 echo "--- Building plugin backend ---"
-cargo build --profile docker
-mkdir -p out
+cargo build --profile docker || exit 1
+mkdir -p out || exit 1
 
-mv target/docker/powertools out/backend
+mv target/docker/powertools out/backend || exit 1
 
 echo " --- Cleaning up ---"
 # remove root-owned target folder
diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh
index db4cf23..77cdcd8 100755
--- a/backend/entrypoint.sh
+++ b/backend/entrypoint.sh
@@ -5,4 +5,4 @@ echo "Container's IP address: `awk 'END{print $1}' /etc/hosts`"
 
 cd /backend
 
-sudo bash build-docker.sh
\ No newline at end of file
+bash build-docker.sh