test: Update 5 files

dehydrate/build.sh

@@ -1,29 +1,26 @@
 #!/bin/bash
-
-set -euo pipefail
+# build.sh using docker run approach
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 PROJECT="dehydrate"
 
-export CMAKE_BUILD_TYPE="Debug"
-
-rm -rf "${SCRIPT_DIR}/output" 
+# Create persistent build directory
+mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
 
-# make sure we have the latest base image.
-docker pull gitea.jde.nz/public/dropshell-build-base:latest
-
-# Build with or without cache based on NO_CACHE environment variable
-CACHE_FLAG=""
-if [ "${NO_CACHE:-false}" = "true" ]; then
-    CACHE_FLAG="--no-cache"
-fi
-
-docker build \
-  ${CACHE_FLAG} \
-  -t "${PROJECT}-build" \
-  -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
-  --build-arg PROJECT="${PROJECT}" \
-  --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
-  --output "${SCRIPT_DIR}/output" \
-  "${SCRIPT_DIR}"
+# Run build in container with mounted directories
+docker run --rm \
+  --user "$(id -u):$(id -g)" \
+  -v "${SCRIPT_DIR}:/src: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 /build && \
+    cmake -G Ninja -S /src -B . \
+      -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
+      -DPROJECT_NAME=${PROJECT} && \
+    cmake --build . && \
+    cp ${PROJECT} /output/
+  "