diff --git a/apps/backend/Makefile b/apps/backend/Makefile index 152fec9d4c..f142c50f52 100644 --- a/apps/backend/Makefile +++ b/apps/backend/Makefile @@ -14,7 +14,7 @@ BUILD_TIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ') LDFLAGS += -X main.Version=$(VERSION) -X main.Commit=$(COMMIT) -X main.BuildTime=$(BUILD_TIME) -.PHONY: all build clean run dev dev-db dev-db-reset test lint fmt vet help +.PHONY: all build build-all build-agentctl clean run dev dev-db dev-db-reset test lint fmt vet help ## Default target all: build @@ -25,12 +25,18 @@ build: @mkdir -p $(BUILD_DIR) $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME) ./cmd/kandev -## Build all binaries (unified + individual services) -build-all: build +## Build all binaries (unified + individual services + agentctl) +build-all: build build-agentctl @echo "Building individual services..." $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/orchestrator ./cmd/orchestrator $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/agent-manager ./cmd/agent-manager +## Build the agentctl sidecar binary +build-agentctl: + @echo "Building agentctl..." + @mkdir -p $(BUILD_DIR) + $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/agentctl ./cmd/agentctl + ## Clean build artifacts clean: @echo "Cleaning..." @@ -115,7 +121,8 @@ help: @echo "" @echo "Targets:" @echo " build Build the unified kandev binary (default)" - @echo " build-all Build all binaries (unified + individual services)" + @echo " build-all Build all binaries (unified + individual services + agentctl)" + @echo " build-agentctl Build the agentctl sidecar binary" @echo " clean Remove build artifacts" @echo " run Build and run the application" @echo " dev Run in development mode with pre-seeded database" diff --git a/apps/backend/dockerfiles/augment-agent/Dockerfile b/apps/backend/dockerfiles/augment-agent/Dockerfile index 36c83aca0f..285a6b3e74 100644 --- a/apps/backend/dockerfiles/augment-agent/Dockerfile +++ b/apps/backend/dockerfiles/augment-agent/Dockerfile @@ -1,22 +1,9 @@ # Augment Agent Dockerfile # A coding agent powered by Auggie CLI (Augment Code) with agentctl sidecar - -# Stage 1: Build agentctl from Go source -FROM golang:1.24-alpine AS builder - -WORKDIR /build - -# Copy go mod files -COPY go.mod go.sum ./ -RUN go mod download - -# Copy source code -COPY . . - -# Build agentctl binary -RUN CGO_ENABLED=0 GOOS=linux go build -o /agentctl ./cmd/agentctl - -# Stage 2: Final image with Node.js and agentctl +# +# Prerequisites: Build agentctl before building this image: +# make build-agentctl +# FROM node:20-slim # Install dependencies @@ -32,8 +19,8 @@ RUN apt-get update && apt-get install -y \ # Install Auggie CLI from npm RUN npm install -g @augmentcode/auggie -# Copy agentctl binary from builder -COPY --from=builder /agentctl /usr/local/bin/agentctl +# Copy pre-built agentctl binary (run `make build-agentctl` first) +COPY bin/agentctl /usr/local/bin/agentctl RUN chmod +x /usr/local/bin/agentctl # Create agent directory