From 4badce0ed497b0e16d64a13831e7c1a7def75628 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Jun 2025 23:29:14 +1200 Subject: [PATCH] Modify dehydrate/build.sh --- dehydrate/build.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dehydrate/build.sh b/dehydrate/build.sh index e03aa7b..1cdf942 100755 --- a/dehydrate/build.sh +++ b/dehydrate/build.sh @@ -2,20 +2,12 @@ set -euo pipefail # Get script directory - handle different execution contexts -if [ -n "${BASH_SOURCE[0]}" ]; then - SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -else - SCRIPT_DIR="$( cd "$( dirname "$0" )" &> /dev/null && pwd )" -fi +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")" - # Debug output for CI echo "${PROJECT} build script running from: ${SCRIPT_DIR}" -mkdir -p "${SCRIPT_DIR}/build" -mkdir -p "${SCRIPT_DIR}/output" - # Run build in container with mounted directories COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ @@ -26,11 +18,9 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ echo "Building in new docker container" docker run --rm \ --user "$(id -u):$(id -g)" \ - -v "${SCRIPT_DIR}:/app:ro" \ - -v "${SCRIPT_DIR}/build:/app/build" \ - -v "${SCRIPT_DIR}/output:/app/output" \ + -v "${SCRIPT_DIR}:/app" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ gitea.jde.nz/public/dropshell-build-base:latest \ bash -c "cd /app && ${COMMAND_TO_RUN}" -echo "Build complete" \ No newline at end of file +echo "Build complete"