From 2f056b85002d49c7e75aacaaa4b4b8be145444dd Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 29 Jun 2025 22:14:13 +1200
Subject: [PATCH] config: Update 3 files

---
 .gitea/workflows/BuildTestPublish.yaml |  5 ++++-
 dehydrate/build.sh                     | 17 ++++++++++-------
 getpkg/build.sh                        | 17 ++++++++++-------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/BuildTestPublish.yaml b/.gitea/workflows/BuildTestPublish.yaml
index 69e8e72..13a8659 100644
--- a/.gitea/workflows/BuildTestPublish.yaml
+++ b/.gitea/workflows/BuildTestPublish.yaml
@@ -26,7 +26,10 @@ jobs:
           password: ${{ secrets.DOCKER_PUSH_TOKEN }}
       - name: Build Test Publish All
         run: |
-          SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} ./buildtestpublish_all.sh
+          SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} \
+          RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} \
+          GITEA_CONTAINER_NAME=${{ env.JOB_CONTAINER_NAME }} \
+          ./buildtestpublish_all.sh
 
   test-install-from-scratch:
     needs: [build]
diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index cd4d7cf..779530e 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -13,20 +13,23 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
-mkdir -p "./build"
-mkdir -p "./output"
+mkdir -p "${SCRIPT_DIR}/build"
+mkdir -p "${SCRIPT_DIR}/output"
 
 # Run build in container with mounted directories
 docker run --rm \
   --user "$(id -u):$(id -g)" \
-  -v ".:/app" \
+  ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
+  -v "${SCRIPT_DIR}:/app:ro" \
+  -v "${SCRIPT_DIR}/build:/build" \
+  -v "${SCRIPT_DIR}/output:/output" \
   -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
   gitea.jde.nz/public/dropshell-build-base:latest \
   bash -c "
-    cd /app && ls -la && \
-    cmake -G Ninja -S /app -B /app/build \
+    cd /build && \
+    cmake -G Ninja -S /app -B . \
       -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
       -DPROJECT_NAME=${PROJECT} && \
-    cmake --build /app/build && \
-    cp /app/build/${PROJECT} /app/output/
+    cmake --build . && \
+    cp ${PROJECT} /output/
   "
diff --git a/getpkg/build.sh b/getpkg/build.sh
index cd4d7cf..779530e 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -13,20 +13,23 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
-mkdir -p "./build"
-mkdir -p "./output"
+mkdir -p "${SCRIPT_DIR}/build"
+mkdir -p "${SCRIPT_DIR}/output"
 
 # Run build in container with mounted directories
 docker run --rm \
   --user "$(id -u):$(id -g)" \
-  -v ".:/app" \
+  ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
+  -v "${SCRIPT_DIR}:/app:ro" \
+  -v "${SCRIPT_DIR}/build:/build" \
+  -v "${SCRIPT_DIR}/output:/output" \
   -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
   gitea.jde.nz/public/dropshell-build-base:latest \
   bash -c "
-    cd /app && ls -la && \
-    cmake -G Ninja -S /app -B /app/build \
+    cd /build && \
+    cmake -G Ninja -S /app -B . \
       -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
       -DPROJECT_NAME=${PROJECT} && \
-    cmake --build /app/build && \
-    cp /app/build/${PROJECT} /app/output/
+    cmake --build . && \
+    cp ${PROJECT} /output/
   "