feat: Enhance Docker build script with advanced configuration and speech support
- Add flexible build options for standard, speech, and GPU configurations - Implement colored output and improved logging for build process - Support dynamic build arguments for speech and GPU features - Add comprehensive build summary and status reporting - Update docker-compose.speech.yml to use latest image tag - Improve resource management and build performance
This commit is contained in:
118
docker-build.sh
118
docker-build.sh
@@ -3,16 +3,52 @@
|
|||||||
# Enable error handling
|
# Enable error handling
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
NC='\033[0m'
|
||||||
|
|
||||||
|
# Function to print colored messages
|
||||||
|
print_message() {
|
||||||
|
local color=$1
|
||||||
|
local message=$2
|
||||||
|
echo -e "${color}${message}${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
# Function to clean up on script exit
|
# Function to clean up on script exit
|
||||||
cleanup() {
|
cleanup() {
|
||||||
echo "Cleaning up..."
|
print_message "$YELLOW" "Cleaning up..."
|
||||||
docker builder prune -f --filter until=24h
|
docker builder prune -f --filter until=24h
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
# Parse command line arguments
|
||||||
|
ENABLE_SPEECH=false
|
||||||
|
ENABLE_GPU=false
|
||||||
|
BUILD_TYPE="standard"
|
||||||
|
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case $1 in
|
||||||
|
--speech)
|
||||||
|
ENABLE_SPEECH=true
|
||||||
|
BUILD_TYPE="speech"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--gpu)
|
||||||
|
ENABLE_GPU=true
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
print_message "$RED" "Unknown option: $1"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
# Clean up Docker system
|
# Clean up Docker system
|
||||||
echo "Cleaning up Docker system..."
|
print_message "$YELLOW" "Cleaning up Docker system..."
|
||||||
docker system prune -f --volumes
|
docker system prune -f --volumes
|
||||||
|
|
||||||
# Set build arguments for better performance
|
# Set build arguments for better performance
|
||||||
@@ -26,23 +62,47 @@ BUILD_MEM=$(( TOTAL_MEM / 2 )) # Use half of available memory
|
|||||||
CPU_COUNT=$(nproc)
|
CPU_COUNT=$(nproc)
|
||||||
CPU_QUOTA=$(( CPU_COUNT * 50000 )) # Allow 50% CPU usage per core
|
CPU_QUOTA=$(( CPU_COUNT * 50000 )) # Allow 50% CPU usage per core
|
||||||
|
|
||||||
echo "Building with ${BUILD_MEM}MB memory limit and CPU quota ${CPU_QUOTA}"
|
print_message "$YELLOW" "Building with ${BUILD_MEM}MB memory limit and CPU quota ${CPU_QUOTA}"
|
||||||
|
|
||||||
# Remove any existing lockfile
|
# Remove any existing lockfile
|
||||||
rm -f bun.lockb
|
rm -f bun.lockb
|
||||||
|
|
||||||
# Build with resource limits, optimizations, and timeout
|
# Base build arguments
|
||||||
echo "Building Docker image..."
|
BUILD_ARGS=(
|
||||||
|
--memory="${BUILD_MEM}m"
|
||||||
|
--memory-swap="${BUILD_MEM}m"
|
||||||
|
--cpu-quota="${CPU_QUOTA}"
|
||||||
|
--build-arg BUILDKIT_INLINE_CACHE=1
|
||||||
|
--build-arg DOCKER_BUILDKIT=1
|
||||||
|
--build-arg NODE_ENV=production
|
||||||
|
--progress=plain
|
||||||
|
--no-cache
|
||||||
|
--compress
|
||||||
|
)
|
||||||
|
|
||||||
|
# Add speech-specific build arguments if enabled
|
||||||
|
if [ "$ENABLE_SPEECH" = true ]; then
|
||||||
|
BUILD_ARGS+=(
|
||||||
|
--build-arg ENABLE_SPEECH_FEATURES=true
|
||||||
|
--build-arg ENABLE_WAKE_WORD=true
|
||||||
|
--build-arg ENABLE_SPEECH_TO_TEXT=true
|
||||||
|
)
|
||||||
|
|
||||||
|
# Add GPU support if requested
|
||||||
|
if [ "$ENABLE_GPU" = true ]; then
|
||||||
|
BUILD_ARGS+=(
|
||||||
|
--build-arg CUDA_VISIBLE_DEVICES=0
|
||||||
|
--build-arg COMPUTE_TYPE=float16
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Build the images
|
||||||
|
print_message "$YELLOW" "Building Docker image (${BUILD_TYPE} build)..."
|
||||||
|
|
||||||
|
# Build main image
|
||||||
DOCKER_BUILDKIT=1 docker build \
|
DOCKER_BUILDKIT=1 docker build \
|
||||||
--memory="${BUILD_MEM}m" \
|
"${BUILD_ARGS[@]}" \
|
||||||
--memory-swap="${BUILD_MEM}m" \
|
|
||||||
--cpu-quota="${CPU_QUOTA}" \
|
|
||||||
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
|
||||||
--build-arg DOCKER_BUILDKIT=1 \
|
|
||||||
--build-arg NODE_ENV=production \
|
|
||||||
--progress=plain \
|
|
||||||
--no-cache \
|
|
||||||
--compress \
|
|
||||||
-t homeassistant-mcp:latest \
|
-t homeassistant-mcp:latest \
|
||||||
-t homeassistant-mcp:$(date +%Y%m%d) \
|
-t homeassistant-mcp:$(date +%Y%m%d) \
|
||||||
.
|
.
|
||||||
@@ -50,15 +110,39 @@ DOCKER_BUILDKIT=1 docker build \
|
|||||||
# Check if build was successful
|
# Check if build was successful
|
||||||
BUILD_EXIT_CODE=$?
|
BUILD_EXIT_CODE=$?
|
||||||
if [ $BUILD_EXIT_CODE -eq 124 ]; then
|
if [ $BUILD_EXIT_CODE -eq 124 ]; then
|
||||||
echo "Build timed out after 15 minutes!"
|
print_message "$RED" "Build timed out after 15 minutes!"
|
||||||
exit 1
|
exit 1
|
||||||
elif [ $BUILD_EXIT_CODE -ne 0 ]; then
|
elif [ $BUILD_EXIT_CODE -ne 0 ]; then
|
||||||
echo "Build failed with exit code ${BUILD_EXIT_CODE}!"
|
print_message "$RED" "Build failed with exit code ${BUILD_EXIT_CODE}!"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
echo "Build completed successfully!"
|
print_message "$GREEN" "Main image build completed successfully!"
|
||||||
|
|
||||||
# Show image size and layers
|
# Show image size and layers
|
||||||
docker image ls homeassistant-mcp:latest --format "Image size: {{.Size}}"
|
docker image ls homeassistant-mcp:latest --format "Image size: {{.Size}}"
|
||||||
echo "Layer count: $(docker history homeassistant-mcp:latest | wc -l)"
|
echo "Layer count: $(docker history homeassistant-mcp:latest | wc -l)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Build speech-related images if enabled
|
||||||
|
if [ "$ENABLE_SPEECH" = true ]; then
|
||||||
|
print_message "$YELLOW" "Building speech-related images..."
|
||||||
|
|
||||||
|
# Build fast-whisper image
|
||||||
|
print_message "$YELLOW" "Building fast-whisper image..."
|
||||||
|
docker pull onerahmet/openai-whisper-asr-webservice:latest
|
||||||
|
|
||||||
|
# Build wake-word image
|
||||||
|
print_message "$YELLOW" "Building wake-word image..."
|
||||||
|
docker pull rhasspy/wyoming-openwakeword:latest
|
||||||
|
|
||||||
|
print_message "$GREEN" "Speech-related images built successfully!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_message "$GREEN" "All builds completed successfully!"
|
||||||
|
|
||||||
|
# Show final status
|
||||||
|
print_message "$YELLOW" "Build Summary:"
|
||||||
|
echo "Build Type: $BUILD_TYPE"
|
||||||
|
echo "Speech Features: $([ "$ENABLE_SPEECH" = true ] && echo 'Enabled' || echo 'Disabled')"
|
||||||
|
echo "GPU Support: $([ "$ENABLE_GPU" = true ] && echo 'Enabled' || echo 'Disabled')"
|
||||||
|
docker image ls | grep -E 'homeassistant-mcp|whisper|openwakeword'
|
||||||
@@ -2,6 +2,7 @@ version: '3.8'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
homeassistant-mcp:
|
homeassistant-mcp:
|
||||||
|
image: homeassistant-mcp:latest
|
||||||
environment:
|
environment:
|
||||||
- ENABLE_SPEECH_FEATURES=${ENABLE_SPEECH_FEATURES:-true}
|
- ENABLE_SPEECH_FEATURES=${ENABLE_SPEECH_FEATURES:-true}
|
||||||
- ENABLE_WAKE_WORD=${ENABLE_WAKE_WORD:-true}
|
- ENABLE_WAKE_WORD=${ENABLE_WAKE_WORD:-true}
|
||||||
@@ -26,7 +27,7 @@ services:
|
|||||||
cpus: '4.0'
|
cpus: '4.0'
|
||||||
memory: 2G
|
memory: 2G
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "curl", "-f", "http://localhost:9000/health" ]
|
test: [ "CMD", "curl", "-f", "http://localhost:9000/asr/health" ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|||||||
Reference in New Issue
Block a user