Merge pull request #127 from dataforgoodfr/126_docker_shared_network_dev

broija · web-flow · commit bb237cf7785b · 2025-08-25T16:52:48.000+02:00
[DB][DEV] Added docker network for APIs (#126_docker_shared_network_dev)
diff --git a/dispatcher/.env.dev b/dispatcher/.env.dev
@@ -0,0 +1,5 @@
+DB_HOST=db
+DB_PORT=5432
+RESCUE_API_POSTGRES_DB=us_climate_data
+RESCUE_API_POSTGRES_USER=postgres
+RESCUE_API_POSTGRES_PASSWORD=my_password
diff --git a/dispatcher/docker-compose.dev.yml b/dispatcher/docker-compose.dev.yml
@@ -2,4 +2,11 @@ services:
   dispatcher-rescue-api:
     volumes:
       - .:/app
-    command: uv run fastapi dev api/dispatcher_service.py --host 0.0.0.0 --port 8081
+    command: uv run fastapi dev api/dispatcher_service.py --host 0.0.0.0 --port 8081
+    networks:
+      - rescue_db
+
+networks:
+  rescue_db:
+    name: rescue_db
+    external: true
diff --git a/dispatcher/pyproject.toml b/dispatcher/pyproject.toml
@@ -10,4 +10,6 @@ dependencies = [
     "pydantic>=2.11.7",
     "pydantic_core>=2.33.2",
     "uvicorn==0.35.0",
+    "psycopg2-binary>=2.9.9",
+    "sqlalchemy>=2.0.0",
 ]
diff --git a/dispatcher/uv.lock b/dispatcher/uv.lock
diff --git a/priorizer/.env.dev b/priorizer/.env.dev
@@ -0,0 +1,5 @@
+DB_HOST=db
+DB_PORT=5432
+RESCUE_API_POSTGRES_DB=us_climate_data
+RESCUE_API_POSTGRES_USER=postgres
+RESCUE_API_POSTGRES_PASSWORD=my_password
diff --git a/priorizer/docker-compose.dev.yml b/priorizer/docker-compose.dev.yml
@@ -2,4 +2,11 @@ services:
   priorizer-api:
     volumes:
       - .:/app
-    command: uv run fastapi dev main.py --host 0.0.0.0 --port 8082
+    command: uv run fastapi dev main.py --host 0.0.0.0 --port 8082
+    networks:
+      - rescue_db
+
+networks:
+  rescue_db:
+    name: rescue_db
+    external: true
diff --git a/priorizer/pyproject.toml b/priorizer/pyproject.toml
@@ -14,4 +14,6 @@ dependencies = [
     "starlette>=0.47.2",
     "typing-extensions>=4.14.1",
     "uvicorn==0.35.0",
+    "psycopg2-binary>=2.9.9",
+    "sqlalchemy>=2.0.0",
 ]
diff --git a/priorizer/uv.lock b/priorizer/uv.lock
diff --git a/rescue_db/docker-compose.dev.yml b/rescue_db/docker-compose.dev.yml
@@ -4,4 +4,15 @@ services:
       - .:/app
     environment:
       - PYTHONPATH=/app:/app/rescue_db
-    command: uv run fastapi dev rescue_api/main.py --host 0.0.0.0 --port 80
+    command: uv run fastapi dev rescue_api/main.py --host 0.0.0.0 --port 80
+    networks:
+      - rescue_db
+
+  db:
+    networks:
+      - rescue_db
+
+networks:
+  rescue_db:
+    name: rescue_db
+    driver: bridge

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@ dependencies = [`
`10`	`10`	`"pydantic>=2.11.7",`
`11`	`11`	`"pydantic_core>=2.33.2",`
`12`	`12`	`"uvicorn==0.35.0",`
	`13`	`+ "psycopg2-binary>=2.9.9",`
	`14`	`+ "sqlalchemy>=2.0.0",`
`13`	`15`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ dependencies = [`
`14`	`14`	`"starlette>=0.47.2",`
`15`	`15`	`"typing-extensions>=4.14.1",`
`16`	`16`	`"uvicorn==0.35.0",`
	`17`	`+ "psycopg2-binary>=2.9.9",`
	`18`	`+ "sqlalchemy>=2.0.0",`
`17`	`19`	`]`