Upload 25 files

app.py

@@ -1,9 +1,9 @@
 from fastapi import FastAPI
-import docker
 import dotenv
 from routers.deploy import router as deploy_router
 from routers.controls import router as controls_router
 from routers.logs import router as logs_router
+from docker_client import docker_client
 
 # Load environment variables
 dotenv.load_dotenv()
@@ -13,11 +13,11 @@ app.include_router(controls_router, prefix="/controls")
 app.include_router(logs_router, prefix="/logs")
 app.include_router(deploy_router, prefix="/deploy")
 
-client = docker.from_env()
-
 @app.get("/")
 def dashboard():
-    containers = client.containers.list(all=True)
+    if not docker_client:
+        return {"message": "Docker is not available"}
+    containers = docker_client.containers.list(all=True)
     container_list = [
         {
             "id": container.id,

docker_client.py

@@ -0,0 +1,12 @@
+import docker
+
+def get_docker_client():
+    try:
+        # Check if Docker is available
+        client = docker.from_env()
+        client.ping()
+        return client
+    except Exception:
+        return None
+
+docker_client = get_docker_client()

routers/controls.py

@@ -1,16 +1,15 @@
 from fastapi import APIRouter, HTTPException
-from fastapi.responses import JSONResponse, HTMLResponse
-import docker
-from docker import client
+from fastapi.responses import JSONResponse
+from docker_client import docker_client
 
 router = APIRouter()
 
-docker_client = docker.from_env()
-
 @router.get("/start/{container_name}")
 def start_container(container_name: str):
+    if not docker_client:
+        raise HTTPException(status_code=503, detail="Docker is not available")
     try:
-        container = client.containers.get(container_name)
+        container = docker_client.containers.get(container_name)
         container.unpause()
         return JSONResponse({"status": "started"})
     except Exception as e:
@@ -18,8 +17,10 @@ def start_container(container_name: str):
 
 @router.get("/pause/{container_name}")
 def pause_container(container_name: str):
+    if not docker_client:
+        raise HTTPException(status_code=503, detail="Docker is not available")
     try:
-        container = client.containers.get(container_name)
+        container = docker_client.containers.get(container_name)
         container.pause()
         return JSONResponse({"status": "paused"})
     except Exception as e:
@@ -27,8 +28,10 @@ def pause_container(container_name: str):
 
 @router.get("/stop/{container_name}")
 def stop_container(container_name: str):
+    if not docker_client:
+        raise HTTPException(status_code=503, detail="Docker is not available")
     try:
-        container = client.containers.get(container_name)
+        container = docker_client.containers.get(container_name)
         container.stop()
         container.remove(force=True)
         return JSONResponse({"status": "stopped and removed"})

routers/deploy.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, HTTPException, UploadFile, Form
 from fastapi.responses import JSONResponse
-import docker
+from docker_client import docker_client
 import uuid
 import zipfile
 import os
@@ -11,6 +11,8 @@ router = APIRouter()
 
 @router.post("/project")
 async def deploy_code(file: UploadFile, app_name: str = Form(...)):
+    if not docker_client:
+        raise HTTPException(status_code=503, detail="Docker is not available")
     if not file.filename.endswith(".zip"):
         raise HTTPException(status_code=400, detail="Only .zip files are supported")
     
@@ -81,7 +83,6 @@ async def deploy_code(file: UploadFile, app_name: str = Form(...)):
     container_name = image_name
 
     try:
-        docker_client = docker.from_env()
         for c in docker_client.containers.list(all=True):
             if c.status in ["created", "exited"]:
                 print(f"Removing leftover container {c.name} ({c.id})")
@@ -118,4 +119,9 @@ async def deploy_code(file: UploadFile, app_name: str = Form(...)):
         })
 
     except Exception as e:
-        return JSONResponse({"error": str(e)}, status_code=500)
+        return JSONResponse({"error": str(e)}, status_code=500)
+
+@router.get("/project/{project_id}")
+def get_project_status(project_id: str):
+    # Placeholder for project status logic
+    return JSONResponse({"project_id": project_id, "status": "running"})