## P2P Connectivity Fixes - **Root Cause**: mDNS discovery was conditionally disabled in Task Execution Engine implementation - **Solution**: Restored always-enabled mDNS discovery from working baseline (eb2e05f) - **Result**: 9/9 Docker Swarm replicas with working P2P mesh, democratic elections, and leader consensus ## Dynamic Version System - **Problem**: Hardcoded version "0.1.0-dev" in 1000+ builds made debugging impossible - **Solution**: Implemented build-time version injection via ldflags - **Features**: Shows commit hash, build date, and semantic version - **Example**: `CHORUS-agent 0.5.5 (build:9dbd361, 2025-09-26_05:55:55)` ## Container Compatibility - **Issue**: Binary execution failed in Alpine due to glibc/musl incompatibility - **Solution**: Added Ubuntu-based Dockerfile for proper glibc support - **Benefit**: Reliable container execution across Docker Swarm nodes ## Key Changes - `internal/runtime/shared.go`: Always enable mDNS discovery, dynamic version vars - `cmd/agent/main.go`: Build-time version injection and display - `p2p/node.go`: Restored working "🐝 Bzzz Node Status" logging format - `Makefile`: Updated version to 0.5.5, proper ldflags configuration - `Dockerfile.ubuntu`: New glibc-compatible container base - `docker-compose.yml`: Updated to latest image tag for Watchtower auto-updates ## Verification ✅ P2P mesh connectivity: Peers exchanging availability broadcasts ✅ Democratic elections: Candidacy announcements and leader selection ✅ BACKBEAT integration: Beat synchronization and degraded mode handling ✅ Dynamic versioning: All containers show v0.5.5 with build metadata ✅ Task Execution Engine: All Phase 4 functionality preserved and working Fixes P2P connectivity regression while preserving complete Task Execution Engine implementation. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
130 lines
4.0 KiB
Makefile
130 lines
4.0 KiB
Makefile
# CHORUS Multi-Binary Makefile
|
|
# Builds both chorus-agent and chorus-hap binaries
|
|
|
|
# Build configuration
|
|
BINARY_NAME_AGENT = chorus-agent
|
|
BINARY_NAME_HAP = chorus-hap
|
|
BINARY_NAME_COMPAT = chorus
|
|
VERSION ?= 0.5.5
|
|
COMMIT_HASH ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
|
|
BUILD_DATE ?= $(shell date -u '+%Y-%m-%d_%H:%M:%S')
|
|
|
|
# Go build flags
|
|
LDFLAGS = -ldflags "-X main.version=$(VERSION) -X main.commitHash=$(COMMIT_HASH) -X main.buildDate=$(BUILD_DATE)"
|
|
BUILD_FLAGS = -v $(LDFLAGS)
|
|
|
|
# Directories
|
|
BUILD_DIR = build
|
|
CMD_DIR = cmd
|
|
|
|
# Default target
|
|
.PHONY: all
|
|
all: clean build
|
|
|
|
# Build all binaries (including compatibility wrapper)
|
|
.PHONY: build
|
|
build: build-agent build-hap build-compat
|
|
|
|
# Build autonomous agent binary
|
|
.PHONY: build-agent
|
|
build-agent:
|
|
@echo "🤖 Building CHORUS autonomous agent..."
|
|
@mkdir -p $(BUILD_DIR)
|
|
go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(BINARY_NAME_AGENT) ./$(CMD_DIR)/agent
|
|
@echo "✅ Agent binary built: $(BUILD_DIR)/$(BINARY_NAME_AGENT)"
|
|
|
|
# Build human agent portal binary
|
|
.PHONY: build-hap
|
|
build-hap:
|
|
@echo "👤 Building CHORUS human agent portal..."
|
|
@mkdir -p $(BUILD_DIR)
|
|
go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(BINARY_NAME_HAP) ./$(CMD_DIR)/hap
|
|
@echo "✅ HAP binary built: $(BUILD_DIR)/$(BINARY_NAME_HAP)"
|
|
|
|
# Build compatibility wrapper (deprecated)
|
|
.PHONY: build-compat
|
|
build-compat:
|
|
@echo "⚠️ Building CHORUS compatibility wrapper (deprecated)..."
|
|
@mkdir -p $(BUILD_DIR)
|
|
go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(BINARY_NAME_COMPAT) ./$(CMD_DIR)/chorus
|
|
@echo "✅ Compatibility wrapper built: $(BUILD_DIR)/$(BINARY_NAME_COMPAT)"
|
|
|
|
# Test compilation without building
|
|
.PHONY: test-compile
|
|
test-compile:
|
|
@echo "🔍 Testing compilation of both binaries..."
|
|
go build -o /dev/null ./$(CMD_DIR)/agent
|
|
go build -o /dev/null ./$(CMD_DIR)/hap
|
|
@echo "✅ Both binaries compile successfully"
|
|
|
|
# Run tests
|
|
.PHONY: test
|
|
test:
|
|
@echo "🧪 Running tests..."
|
|
go test -v ./...
|
|
|
|
# Clean build artifacts
|
|
.PHONY: clean
|
|
clean:
|
|
@echo "🧹 Cleaning build artifacts..."
|
|
rm -rf $(BUILD_DIR)
|
|
@echo "✅ Clean complete"
|
|
|
|
# Install both binaries to GOPATH/bin
|
|
.PHONY: install
|
|
install: build
|
|
@echo "📦 Installing binaries to GOPATH/bin..."
|
|
cp $(BUILD_DIR)/$(BINARY_NAME_AGENT) $(shell go env GOPATH)/bin/
|
|
cp $(BUILD_DIR)/$(BINARY_NAME_HAP) $(shell go env GOPATH)/bin/
|
|
@echo "✅ Binaries installed"
|
|
|
|
# Development helpers
|
|
.PHONY: run-agent
|
|
run-agent: build-agent
|
|
@echo "🚀 Running CHORUS agent..."
|
|
./$(BUILD_DIR)/$(BINARY_NAME_AGENT)
|
|
|
|
.PHONY: run-hap
|
|
run-hap: build-hap
|
|
@echo "🚀 Running CHORUS HAP..."
|
|
./$(BUILD_DIR)/$(BINARY_NAME_HAP)
|
|
|
|
# Docker builds
|
|
.PHONY: docker-agent
|
|
docker-agent:
|
|
@echo "🐳 Building Docker image for CHORUS agent..."
|
|
docker build -f docker/Dockerfile.agent -t chorus-agent:$(VERSION) .
|
|
|
|
.PHONY: docker-hap
|
|
docker-hap:
|
|
@echo "🐳 Building Docker image for CHORUS HAP..."
|
|
docker build -f docker/Dockerfile.hap -t chorus-hap:$(VERSION) .
|
|
|
|
.PHONY: docker
|
|
docker: docker-agent docker-hap
|
|
|
|
# Help
|
|
.PHONY: help
|
|
help:
|
|
@echo "CHORUS Multi-Binary Build System"
|
|
@echo ""
|
|
@echo "Targets:"
|
|
@echo " all - Clean and build both binaries (default)"
|
|
@echo " build - Build both binaries"
|
|
@echo " build-agent - Build autonomous agent binary only"
|
|
@echo " build-hap - Build human agent portal binary only"
|
|
@echo " test-compile - Test that both binaries compile"
|
|
@echo " test - Run tests"
|
|
@echo " clean - Remove build artifacts"
|
|
@echo " install - Install binaries to GOPATH/bin"
|
|
@echo " run-agent - Build and run agent"
|
|
@echo " run-hap - Build and run HAP"
|
|
@echo " docker - Build Docker images for both binaries"
|
|
@echo " docker-agent - Build Docker image for agent only"
|
|
@echo " docker-hap - Build Docker image for HAP only"
|
|
@echo " help - Show this help"
|
|
@echo ""
|
|
@echo "Environment Variables:"
|
|
@echo " VERSION - Version string (default: 0.1.0-dev)"
|
|
@echo " COMMIT_HASH - Git commit hash (auto-detected)"
|
|
@echo " BUILD_DATE - Build timestamp (auto-generated)"
|