forked from tfgrid/zosbuilder
fix: Switch to space-separated sources.conf format
- Change from colon to space separation to avoid URL parsing issues - Update sources.conf format: TYPE NAME URL VERSION BUILD_FUNCTION [EXTRA] - Implement awk-based parsing for reliable field extraction - Fix firmware package list (remove unavailable linux-firmware-marvell)
This commit is contained in:
@@ -163,34 +163,15 @@ function docker_run_build() {
|
||||
# Ensure build script is executable
|
||||
safe_execute chmod +x "${PROJECT_ROOT}/${script_path}"
|
||||
|
||||
# Setup container arguments with writable build directory
|
||||
local volume_args="-v ${PROJECT_ROOT}:/source:ro -v ${PROJECT_ROOT}/dist:/workspace/dist"
|
||||
local work_args="-w /workspace"
|
||||
|
||||
# Create dist directory on host if it doesn't exist
|
||||
safe_mkdir "${PROJECT_ROOT}/dist"
|
||||
|
||||
log_info "Executing build command in container: ${build_command}"
|
||||
log_info "Source (read-only): /source"
|
||||
log_info "Output (writable): /workspace/dist"
|
||||
|
||||
# Run container with script that copies source and builds
|
||||
# Run with privileged access for chroot mounts and system operations
|
||||
safe_execute ${CONTAINER_RUNTIME} run --rm \
|
||||
${volume_args} \
|
||||
${work_args} \
|
||||
--privileged \
|
||||
-v "${PROJECT_ROOT}:/workspace" \
|
||||
-w /workspace \
|
||||
"${image}" \
|
||||
/bin/bash -c "
|
||||
# Copy source to writable location
|
||||
cp -r /source/* /workspace/ 2>/dev/null || true
|
||||
chmod +x /workspace/scripts/build.sh
|
||||
|
||||
# Run build with proper paths
|
||||
cd /workspace
|
||||
${build_command}
|
||||
|
||||
# Copy results back
|
||||
cp -r /workspace/dist/* /workspace/dist/ 2>/dev/null || true
|
||||
"
|
||||
${build_command}
|
||||
}
|
||||
|
||||
# Commit container state for reuse
|
||||
|
||||
Reference in New Issue
Block a user