From e5f3569b2a90d31e5c0ba59a6db6e8a05d6fba26 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Jun 2025 21:40:27 +1200 Subject: [PATCH] Update 2 files --- dehydrate/build.sh | 7 +------ getpkg/build.sh | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dehydrate/build.sh b/dehydrate/build.sh index afea0d9..edff084 100755 --- a/dehydrate/build.sh +++ b/dehydrate/build.sh @@ -16,10 +16,6 @@ echo "Build script running from: ${SCRIPT_DIR}" echo "Current directory: $(pwd)" echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "yes" || echo "no")" -# Create persistent build directory -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)" \ @@ -29,8 +25,7 @@ docker run --rm \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ gitea.jde.nz/public/dropshell-build-base:latest \ bash -c " - echo 'Contents of /src:' && ls -la /src && \ - echo 'Looking for CMakeLists.txt:' && find /src -name 'CMakeLists.txt' && \ + mkdir -p /build /output && \ cd /build && \ cmake -G Ninja -S /src -B . \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ diff --git a/getpkg/build.sh b/getpkg/build.sh index 313b02f..3d0f0aa 100755 --- a/getpkg/build.sh +++ b/getpkg/build.sh @@ -18,24 +18,17 @@ echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "ye echo "Contents of script directory:" ls -la "${SCRIPT_DIR}" -# Create persistent build directory -mkdir -p "${SCRIPT_DIR}/build" -mkdir -p "${SCRIPT_DIR}/output" - # Run build in container with mounted directories -# Note: We mount the directory without :ro first to check if that's the issue docker run --rm \ --user "$(id -u):$(id -g)" \ - -v "${SCRIPT_DIR}:/src" \ + -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 " - echo 'Host script dir contains:' && \ echo 'Contents of /src:' && ls -la /src && \ - echo 'Looking for CMakeLists.txt:' && find /src -name 'CMakeLists.txt' && \ - echo 'Source files in /src:' && ls -la /src/src 2>/dev/null || echo 'No src directory found' && \ + mkdir -p /build /output && \ cd /build && \ cmake -G Ninja -S /src -B . \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \