Merge pull request #254 from kagenti/fix/respect-port-env-var

huang195 · web-flow · commit fc41da85ead9 · 2026-04-21T09:35:32.000-04:00
fix: Read HOST and PORT from env vars instead of hardcoding
diff --git a/a2a/cheerup_agent/Dockerfile b/a2a/cheerup_agent/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/cheerup_agent/src/cheerup_agent/agent.py b/a2a/cheerup_agent/src/cheerup_agent/agent.py
@@ -116,7 +116,9 @@ async def agent_card_compat(request: Request) -> JSONResponse:
 
 def run():
     """Runs the A2A Agent application."""
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=CheerupExecutor(),
@@ -134,4 +136,4 @@ def run():
     app.routes.insert(0, Route("/health", health, methods=["GET"]))
     app.routes.insert(0, Route("/.well-known/agent-card.json", agent_card_compat, methods=["GET"]))
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/file_organizer/Dockerfile b/a2a/file_organizer/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/file_organizer/src/file_organizer/agent.py b/a2a/file_organizer/src/file_organizer/agent.py
@@ -170,7 +170,9 @@ def run():
     """
     Runs the A2A Agent application.
     """
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=FileOrganizerExecutor(),
@@ -195,4 +197,4 @@ def run():
         ),
     )
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/generic_agent/src/generic_agent/agent.py b/a2a/generic_agent/src/generic_agent/agent.py
@@ -186,7 +186,9 @@ def run():
     """
     Runs the A2A Agent application.
     """
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=GenericExecutor(),
@@ -211,4 +213,4 @@ def run():
         ),
     )
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/git_issue_agent/.env.ollama b/a2a/git_issue_agent/.env.ollama
@@ -15,7 +15,7 @@ LLM_API_KEY=ollama
 MODEL_TEMPERATURE=0
 
 # Agent service
-SERVICE_PORT=8000
+PORT=8000
 LOG_LEVEL=DEBUG
 
 # MCP Tool endpoint
diff --git a/a2a/git_issue_agent/.env.openai b/a2a/git_issue_agent/.env.openai
@@ -12,7 +12,7 @@ LLM_API_KEY='{"valueFrom": {"secretKeyRef": {"name": "openai-secret", "key": "ap
 OPENAI_API_KEY='{"valueFrom": {"secretKeyRef": {"name": "openai-secret", "key": "apikey"}}}'
 
 # Agent service
-SERVICE_PORT=8000
+PORT=8000
 LOG_LEVEL=DEBUG
 
 # MCP Tool endpoint
diff --git a/a2a/git_issue_agent/.env.template b/a2a/git_issue_agent/.env.template
@@ -3,6 +3,6 @@ LLM_API_BASE = "http://host.docker.internal:11434"
 LLM_API_KEY = "ollama"
 MODEL_TEMPERATURE = 0
 MCP_URL = "https://api.githubcopilot.com/mcp/"
-SERVICE_PORT = 8000
+PORT = 8000
 LOG_LEVEL = "INFO"
 GITHUB_TOKEN = ""
diff --git a/a2a/git_issue_agent/Dockerfile b/a2a/git_issue_agent/Dockerfile
@@ -12,4 +12,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/git_issue_agent/README.md b/a2a/git_issue_agent/README.md
@@ -18,7 +18,7 @@ The Github Issue Agent is designed to perform tasks dealing with Github issues,
 | EXTRA_HEADERS | Extra headers for the OpenAI API, e.g. {"MY_HEADER": "my_value"} | No | `{}` |
 | MODEL_TEMPERATURE | The temperature for the model | Yes | `0` |
 | MCP_URL | Endpoint where the Slack MCP server can be found | No |  "" |
-| SERVICE_PORT | Port on which the service will run | Yes | `8000` |
+| PORT | Port on which the service will run | Yes | `8000` |
 | LOG_LEVEL | Application log level | No | DEBUG |
 | GITHUB_TOKEN | If set, will send requests to Github MCP Server with `Authorization: Bearer <GITHUB_TOKEN>` header. | No | - |
 | JWKS_URI | Endpoint to obtain JWKS for token validation. Enables token validation. | No | - |
diff --git a/a2a/git_issue_agent/git_issue_agent/config.py b/a2a/git_issue_agent/git_issue_agent/config.py
@@ -29,7 +29,7 @@ class Settings(BaseSettings):
     MCP_URL: str = Field(
         os.getenv("MCP_URL", "https://api.githubcopilot.com/mcp/"), description="Endpoint for an option MCP server"
     )
-    SERVICE_PORT: int = Field(os.getenv("SERVICE_PORT", 8000), description="Port on which the service will run.")
+    SERVICE_PORT: int = Field(os.getenv("PORT", 8000), description="Port on which the service will run.")
     GITHUB_TOKEN: Optional[str] = Field(
         os.getenv("GITHUB_TOKEN", None),
         description="If not using agent with authorization, the default Github token to use",
diff --git a/a2a/image_service/Dockerfile b/a2a/image_service/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/image_service/src/image_service/agent.py b/a2a/image_service/src/image_service/agent.py
@@ -206,7 +206,9 @@ async def cancel(self, context: RequestContext, event_queue: EventQueue) -> None
 
 
 def run():
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=ImageExecutor(),
@@ -231,4 +233,4 @@ def run():
         ),
     )
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/recipe_agent/Dockerfile b/a2a/recipe_agent/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/recipe_agent/src/recipe_agent/agent.py b/a2a/recipe_agent/src/recipe_agent/agent.py
@@ -114,7 +114,9 @@ async def agent_card_compat(request: Request) -> JSONResponse:
 
 def run():
     """Runs the A2A Agent application."""
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=RecipeExecutor(),
@@ -132,4 +134,4 @@ def run():
     app.routes.insert(0, Route("/health", health, methods=["GET"]))
     app.routes.insert(0, Route("/.well-known/agent-card.json", agent_card_compat, methods=["GET"]))
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/reservation_service/Dockerfile b/a2a/reservation_service/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/reservation_service/src/reservation_service/agent.py b/a2a/reservation_service/src/reservation_service/agent.py
@@ -178,7 +178,9 @@ def run():
     """
     Runs the A2A Agent application.
     """
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=ReservationExecutor(),
@@ -203,4 +205,4 @@ def run():
         ),
     )
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/slack_researcher/.env.template b/a2a/slack_researcher/.env.template
@@ -4,5 +4,5 @@ LLM_API_KEY = "ollama"
 MODEL_TEMPERATURE = 0
 MAX_PLAN_STEPS = 6
 MCP_URL = ""
-SERVICE_PORT = 8000
+PORT = 8000
 LOG_LEVEL = "INFO"
diff --git a/a2a/slack_researcher/Dockerfile b/a2a/slack_researcher/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/slack_researcher/README.md b/a2a/slack_researcher/README.md
@@ -19,7 +19,7 @@ The Slack Researcher Agent is designed to perform research tasks across Slack ch
 | MODEL_TEMPERATURE | The temperature for the model | Yes | `0` |
 | MAX_PLAN_STEPS | The maximum number of plan steps | Yes | `6` |
 | MCP_URL | Endpoint where the Slack MCP server can be found | No |  "" |
-| SERVICE_PORT | Port on which the service will run | Yes | `8000` |
+| PORT | Port on which the service will run | Yes | `8000` |
 | LOG_LEVEL | Application log level | No | DEBUG |
 | JWKS_URL | Endpoint to obtain JWKS for token validation. Enables token validation | No | - |
 | ISSUER | Expected `iss` value of incoming bearer tokens | No | - |
diff --git a/a2a/slack_researcher/slack_researcher/config.py b/a2a/slack_researcher/slack_researcher/config.py
@@ -34,7 +34,7 @@ class Settings(BaseSettings):
     MCP_URL: str = Field(
         os.getenv("MCP_URL", "http://slack-tool:8000"), description="Endpoint for an option MCP server"
     )
-    SERVICE_PORT: int = Field(os.getenv("SERVICE_URL", 8000), description="Port on which the service will run.")
+    SERVICE_PORT: int = Field(os.getenv("PORT", 8000), description="Port on which the service will run.")
 
     class Config:
         env_file = ".env"
diff --git a/a2a/trivia_agent/Dockerfile b/a2a/trivia_agent/Dockerfile
@@ -11,4 +11,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/trivia_agent/src/trivia_agent/agent.py b/a2a/trivia_agent/src/trivia_agent/agent.py
@@ -115,7 +115,9 @@ async def agent_card_compat(request: Request) -> JSONResponse:
 
 def run():
     """Runs the A2A Agent application."""
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=TriviaExecutor(),
@@ -133,4 +135,4 @@ def run():
     app.routes.insert(0, Route("/health", health, methods=["GET"]))
     app.routes.insert(0, Route("/.well-known/agent-card.json", agent_card_compat, methods=["GET"]))
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
diff --git a/a2a/weather_service/Dockerfile b/a2a/weather_service/Dockerfile
@@ -14,4 +14,4 @@ ENV PRODUCTION_MODE=True \
 RUN chown -R 1001:1001 /app
 USER 1001
 
-CMD ["uv", "run", "--no-sync", "server", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "--no-sync", "server"]
diff --git a/a2a/weather_service/src/weather_service/agent.py b/a2a/weather_service/src/weather_service/agent.py
@@ -236,7 +236,9 @@ def run():
     """
     Runs the A2A Agent application.
     """
-    agent_card = get_agent_card(host="0.0.0.0", port=8000)
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "8000"))
+    agent_card = get_agent_card(host=host, port=port)
 
     request_handler = DefaultRequestHandler(
         agent_executor=WeatherExecutor(),
@@ -265,4 +267,4 @@ def run():
     # Add tracing middleware - creates root span with MLflow/GenAI attributes
     app.add_middleware(BaseHTTPMiddleware, dispatch=create_tracing_middleware())
 
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host=host, port=port)
