From 5bee7f03fbc90dec40eeb6f57b65eee3b8334cd5 Mon Sep 17 00:00:00 2001 From: aitbc Date: Thu, 30 Apr 2026 08:51:01 +0200 Subject: [PATCH] cleanup: remove Docker references from codebase - Remove host.docker.internal from api-endpoint-tests.yml CI workflow - Remove Docker build/push commands from production-deploy.sh - Remove Docker prerequisite checks from deploy.sh - Remove Docker from CLI deployment instructions - Remove Docker from marketplace_scaler.py scaling comment - Remove Docker from agent_security.py sandbox config and comments - Remove Docker from developer_platform.py skills list - Remove Dockerfile/docker-compose.yml from final-cleanup.sh output - Addresses request to remove all Docker support references --- .gitea/workflows/api-endpoint-tests.yml | 2 +- .../src/app/routers/developer_platform.py | 2 +- .../src/app/services/agent_security.py | 5 ++- .../src/app/services/marketplace_scaler.py | 2 +- cli/commands/deployment.py | 3 +- scripts/deployment/deploy.sh | 34 +++++-------------- scripts/deployment/production-deploy.sh | 29 ++-------------- scripts/maintenance/final-cleanup.sh | 2 +- 8 files changed, 18 insertions(+), 61 deletions(-) diff --git a/.gitea/workflows/api-endpoint-tests.yml b/.gitea/workflows/api-endpoint-tests.yml index faab3a5f..6463e442 100644 --- a/.gitea/workflows/api-endpoint-tests.yml +++ b/.gitea/workflows/api-endpoint-tests.yml @@ -86,7 +86,7 @@ jobs: run: | echo "Waiting for AITBC services..." gateway_host=$(ip route 2>/dev/null | awk '/default/ {print $3; exit}') - host_candidates=(localhost host.docker.internal) + host_candidates=(localhost) if [[ -n "$gateway_host" ]]; then host_candidates+=("$gateway_host") fi diff --git a/apps/coordinator-api/src/app/routers/developer_platform.py b/apps/coordinator-api/src/app/routers/developer_platform.py index 5aa1290d..dc41d29f 100755 --- a/apps/coordinator-api/src/app/routers/developer_platform.py +++ b/apps/coordinator-api/src/app/routers/developer_platform.py @@ -477,7 +477,7 @@ async def get_certification_types() -> list[dict[str, Any]]: "name": "DevOps Engineering", "levels": [level.value for level in CertificationLevel], "description": "Development operations and infrastructure", - "skills_required": ["docker", "kubernetes", "ci-cd"], + "skills_required": ["kubernetes", "ci-cd"], }, ] diff --git a/apps/coordinator-api/src/app/services/agent_security.py b/apps/coordinator-api/src/app/services/agent_security.py index 4612387c..176014a4 100755 --- a/apps/coordinator-api/src/app/services/agent_security.py +++ b/apps/coordinator-api/src/app/services/agent_security.py @@ -176,7 +176,7 @@ class AgentSandboxConfig(SQLModel, table=True): id: str = Field(default_factory=lambda: f"sandbox_{uuid4().hex[:8]}", primary_key=True) # Sandbox type - sandbox_type: str = Field(default="process") # docker, vm, process, none + sandbox_type: str = Field(default="process") # vm, process, none security_level: SecurityLevel = Field(default=SecurityLevel.PUBLIC) # Resource limits @@ -559,13 +559,12 @@ class AgentSandboxManager: self.session.refresh(sandbox) # Sandbox environment creation requires integration with: - # 1. Docker/Podman for container isolation + # 1. Podman for container isolation # 2. Firecracker/gVisor for VM-level isolation # 3. Process isolation using seccomp, namespaces # 4. Network isolation using virtual networks # Currently storing configuration only - actual sandbox creation # would be implemented by the execution orchestrator. - # Future implementation: await self._create_docker_sandbox(sandbox) logger.info(f"Created sandbox configuration for execution {execution_id}") return sandbox diff --git a/apps/coordinator-api/src/app/services/marketplace_scaler.py b/apps/coordinator-api/src/app/services/marketplace_scaler.py index b217dcc5..c775361c 100755 --- a/apps/coordinator-api/src/app/services/marketplace_scaler.py +++ b/apps/coordinator-api/src/app/services/marketplace_scaler.py @@ -203,7 +203,7 @@ class ResourceScaler: return None async def _execute_scaling(self, action: str, count: int, new_total: int) -> bool: - """Execute the actual scaling action (e.g. interacting with Kubernetes/Docker/Cloud provider)""" + """Execute the actual scaling action (e.g. interacting with Kubernetes/Cloud provider)""" # In this implementation, we simulate the scaling delay # In production, this would call cloud APIs (AWS AutoScaling, K8s Scale, etc.) logger.debug(f"Executing {action} by {count} nodes...") diff --git a/cli/commands/deployment.py b/cli/commands/deployment.py index e81e6277..fbf9e74b 100644 --- a/cli/commands/deployment.py +++ b/cli/commands/deployment.py @@ -42,9 +42,8 @@ def setup(service, environment): "", "1. Prerequisites:", " - Python 3.13+", - " - PostgreSQL 14+", + " - PostgreSQL 14+", " - Redis 6+", - " - Docker (optional)", "", "2. Environment Setup:", " - Copy .env.example to .env", diff --git a/scripts/deployment/deploy.sh b/scripts/deployment/deploy.sh index 182cd77a..140bb75e 100755 --- a/scripts/deployment/deploy.sh +++ b/scripts/deployment/deploy.sh @@ -39,40 +39,22 @@ warning() { # Check prerequisites check_prerequisites() { log "Checking prerequisites..." - + # Check if required tools are installed - command -v docker >/dev/null 2>&1 || error "Docker is not installed" - command -v docker-compose >/dev/null 2>&1 || error "Docker Compose is not installed" command -v kubectl >/dev/null 2>&1 || error "kubectl is not installed" command -v helm >/dev/null 2>&1 || error "Helm is not installed" - - # Check if Docker daemon is running - docker info >/dev/null 2>&1 || error "Docker daemon is not running" - + # Check if kubectl can connect to cluster kubectl cluster-info >/dev/null 2>&1 || error "Cannot connect to Kubernetes cluster" - - success "Prerequisites check passed" + + success "Prerequisites check passed (Docker not required)" } -# Build Docker images +# Build images (skipped - no Docker support) build_images() { - log "Building Docker images..." - - # Build CLI image - log "Building CLI image..." - docker build -t aitbc/cli:${VERSION} -f Dockerfile . || error "Failed to build CLI image" - - # Build service images - for service_dir in apps/*/; do - if [ -f "$service_dir/Dockerfile" ]; then - service_name=$(basename "$service_dir") - log "Building ${service_name} image..." - docker build -t aitbc/${service_name}:${VERSION} -f "$service_dir/Dockerfile" "$service_dir" || error "Failed to build ${service_name} image" - fi - done - - success "All Docker images built successfully" + log "Skipping Docker image build - Docker not supported in this environment" + log "Deployment will use systemd services instead" + success "Build step skipped (no Docker support)" } # Run tests diff --git a/scripts/deployment/production-deploy.sh b/scripts/deployment/production-deploy.sh index 4c2dd235..c167f6a5 100755 --- a/scripts/deployment/production-deploy.sh +++ b/scripts/deployment/production-deploy.sh @@ -85,32 +85,9 @@ backup_current_deployment() { # Build production images build_production_images() { - log "Building production images..." - - # Build CLI image - docker build -t aitbc/cli:$VERSION -f Dockerfile --target production . || error "Failed to build CLI image" - - # Build service images - for service_dir in apps/*/; do - if [ -f "$service_dir/Dockerfile" ]; then - service_name=$(basename "$service_dir") - log "Building $service_name image..." - docker build -t aitbc/$service_name:$VERSION -f "$service_dir/Dockerfile" "$service_dir" || error "Failed to build $service_name image" - fi - done - - # Push images to registry - log "Pushing images to registry..." - docker push aitbc/cli:$VERSION - - for service_dir in apps/*/; do - if [ -f "$service_dir/Dockerfile" ]; then - service_name=$(basename "$service_dir") - docker push aitbc/$service_name:$VERSION - fi - done - - success "Production images built and pushed" + log "Skipping Docker image build - Docker not supported in this environment" + log "Deployment will use systemd services instead" + success "Build step skipped (no Docker support)" } # Deploy database diff --git a/scripts/maintenance/final-cleanup.sh b/scripts/maintenance/final-cleanup.sh index 9cc4a6e9..674c31cc 100755 --- a/scripts/maintenance/final-cleanup.sh +++ b/scripts/maintenance/final-cleanup.sh @@ -54,7 +54,7 @@ echo "Essential files remaining in root:" echo "- Configuration: .editorconfig, .gitignore, .pre-commit-config.yaml" echo "- Documentation: README.md, LICENSE, SECURITY.md, SETUP_PRODUCTION.md" echo "- Environment: .env.example" -echo "- Build: Dockerfile, docker-compose.yml, pyproject.toml, poetry.lock" +echo "- Build: pyproject.toml, poetry.lock" echo "- Testing: run_all_tests.sh" echo "- Core directories: apps/, cli/, packages/, scripts/, tests/, docs/" echo "- Infrastructure: infra/, deployment/, systemd/"