feat: Gordon v3 - Sub-Container Architecture with gRPC

Dockerfile

@@ -1,5 +1,6 @@
-# Gordon v2 - Production Dockerfile
+# Gordon v3 - Production Dockerfile
 # Multi-stage build for optimized container image
+# Supports 4 component modes: core, proxy, registry, secrets
 
 # Build stage
 FROM golang:1.25-alpine AS builder
@@ -29,15 +30,24 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
 FROM alpine:latest
 
 # Install runtime dependencies
+# - docker-cli: For core component to manage containers
+# - pass, gnupg: For secrets component (password-store backend)
+# - ca-certificates: TLS support
+# - curl, wget: Health checks and debugging
+# - tzdata: Timezone support
+# - grpc-health-probe: For gRPC health checks
 RUN apk add --no-cache \
     ca-certificates \
     docker-cli \
     curl \
     wget \
     tzdata \
+    pass \
+    gnupg \
+    grpc-health-probe \
     && rm -rf /var/cache/apk/*
 
-# Create non-root user
+# Create non-root user (not used by default - components run as root for Docker socket access)
 RUN adduser -D -s /bin/sh gordon
 
 # Set working directory
@@ -49,24 +59,51 @@ COPY --from=builder /app/gordon .
 # Create data directory
 RUN mkdir -p /data && chown gordon:gordon /data
 
-# Copy default configuration (optional)
-COPY --chown=gordon:gordon gordon.toml.example /app/gordon.toml.example
-
-# Switch to non-root user
-USER gordon
-
-# Expose ports
-EXPOSE 8080 5000
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-    CMD wget --quiet --tries=1 --spider http://localhost:8080/health || exit 1
-
-# Default command
-CMD ["./gordon", "serve"]
+# Copy default configuration
+COPY --chown=gordon:gordon gordon.toml.example /app/gordon.toml
+
+# Environment variables
+# GORDON_COMPONENT: Which component to run (core|proxy|registry|secrets)
+# GORDON_IMAGE: Self-image reference for sub-container deployment
+# HEALTHCHECK_PORT: Port for health checks (varies by component)
+ENV GORDON_COMPONENT="" \
+    GORDON_IMAGE="" \
+    HEALTHCHECK_PORT="5000" \
+    GORDON_LOG_LEVEL="info"
+
+# Expose ports by component:
+# - gordon-core: 5000 (admin API), 9090 (gRPC)
+# - gordon-proxy: 80 (HTTP)
+# - gordon-registry: 5000 (registry HTTP), 9092 (gRPC)
+# - gordon-secrets: 9091 (gRPC)
+EXPOSE 80 5000 9090 9091 9092
+
+# Health check (component-aware)
+# Core/Registry use HTTP on port 5000 by default
+# Proxy uses HTTP on port 80
+# Secrets uses gRPC health on 9091
+HEALTHCHECK --interval=15s --timeout=5s --start-period=30s --retries=3 \
+    CMD \
+    if [ "$GORDON_COMPONENT" = "secrets" ]; then \
+        grpc-health-probe -addr=:9091 || exit 1; \
+    elif [ -n "$GORDON_COMPONENT" ]; then \
+        wget --quiet --tries=1 --spider http://localhost:${HEALTHCHECK_PORT}/v2/health || \
+        wget --quiet --tries=1 --spider http://localhost:${HEALTHCHECK_PORT}/health || \
+        exit 1; \
+    else \
+        wget --quiet --tries=1 --spider http://localhost:${HEALTHCHECK_PORT}/v2/health || \
+        wget --quiet --tries=1 --spider http://localhost:${HEALTHCHECK_PORT}/health || \
+        exit 1; \
+    fi
+
+# Use ENTRYPOINT so we can pass arguments (like --component) after the command
+# For v3 sub-containers, use: docker run gordon:v3-test --component=core
+ENTRYPOINT ["./gordon", "serve"]
+CMD []
 
 # Metadata
 LABEL maintainer="bnemam"
-LABEL version="2.0"
-LABEL description="Event-driven container deployment platform"
-LABEL org.opencontainers.image.source="https://github.com/bnema/gordon"
+LABEL version="3.0"
+LABEL description="Event-driven container deployment platform - v3 sub-container architecture"
+LABEL org.opencontainers.image.source="https://github.com/bnema/gordon"
+LABEL gordon.components="core,proxy,registry,secrets"

Makefile

@@ -1,10 +1,10 @@
 # This Makefile is used for dev purposes
 # Variables
 REPO := ghcr.io/bnema/gordon
-TAG := v2-dev
-DEV_TAG := v2-dev-$(shell date +%Y%m%d-%H%M%S)
+TAG := v3-dev
+DEV_TAG := v3-dev-$(shell date +%Y%m%d-%H%M%S)
 DIST_DIR := ./dist
-ENGINE := podman
+ENGINE ?= podman
 
 # Version information
 VERSION := $(shell git describe --tags --always --dirty)
@@ -22,7 +22,8 @@ ARCHS := amd64 arm64
 
 # Phony targets
 .PHONY: all build build-push clean dev-release \
-	test test-short test-race test-coverage \
+	test test-short test-race test-coverage test-integration test-integration-quick \
+	test-integration-build test-integration-clean \
 	lint fmt check mocks clean-test help
 
 # Default target
@@ -46,6 +47,11 @@ mocks: ## Generate mocks using mockery
 	@mockery
 	@echo "Mocks generated successfully"
 
+proto: ## Generate Go code from protobuf definitions
+	@echo "Generating protobuf code..."
+	@buf generate
+	@echo "Protobuf code generated successfully"
+
 check: lint test ## Run lint and tests
 
 ##@ Testing
@@ -77,6 +83,31 @@ test-usecase: ## Run usecase layer tests only
 test-adapter: ## Run adapter layer tests only
 	@go test -v ./internal/adapters/...
 
+test-integration-clean: ## Clean up leftover test containers from previous runs
+	@echo "Cleaning up test containers..."
+	@-docker stop gordon-core-test gordon-secrets gordon-registry gordon-proxy 2>/dev/null || true
+	@-docker rm -f gordon-core-test gordon-secrets gordon-registry gordon-proxy 2>/dev/null || true
+	@-docker network rm gordon-internal 2>/dev/null || true
+	@-docker network rm -f testcontainers 2>/dev/null || true
+	@-docker network prune -f 2>/dev/null || true
+	@-docker ps -a --filter "label=gordon.component" --format "{{.ID}}" | xargs -r docker rm -f 2>/dev/null || true
+	@echo "Cleanup complete"
+
+test-integration-build: build-local ## Build Gordon test image for integration tests
+	@echo "Building Gordon test image..."
+	@docker build -t gordon:v3-test .
+	@echo "Test image built: gordon:v3-test"
+
+test-integration: test-integration-clean test-integration-build ## Run integration tests (max 10min)
+	@echo "Running integration tests..."
+	@docker pull ghcr.io/bnema/go-hello-world-http:latest || true
+	@go test -v -timeout 10m ./tests/integration/... 2>&1 | tee test-integration.log
+	@echo "Integration tests complete. Log: test-integration.log"
+
+test-integration-quick: test-integration-clean test-integration-build ## Run quick integration tests (startup + gRPC only, ~3min)
+	@echo "Running quick integration tests..."
+	@go test -v -timeout 5m -run "Test01|Test02" ./tests/integration/...
+
 ##@ Build
 
 build: ## Build binaries for linux (amd64 and arm64)

buf.gen.yaml

@@ -0,0 +1,19 @@
+version: v2
+
+managed:
+  enabled: true
+  override:
+    - file_option: go_package
+      value: github.com/bnema/gordon/internal/grpc
+
+plugins:
+  - remote: buf.build/protocolbuffers/go:v1.36.4
+    out: internal/grpc
+    opt:
+      - paths=import
+
+  - remote: buf.build/grpc/go:v1.5.1
+    out: internal/grpc
+    opt:
+      - paths=import
+      - require_unimplemented_servers=false

buf.yaml

@@ -0,0 +1,18 @@
+version: v2
+
+modules:
+  - path: api/proto
+    name: buf.build/bnema/gordon
+
+deps:
+  - buf.build/googleapis/googleapis
+
+lint:
+  use:
+    - DEFAULT
+  except:
+    - PACKAGE_VERSION_SUFFIX
+
+breaking:
+  use:
+    - FILE