fix DOOD config

Author: chriscarrollsmith

.devcontainer/devcontainer.json

@@ -1,27 +1,24 @@
 {
   "name": "FastAPI Jinja2 Postgres WebApp",
+  "image": "mcr.microsoft.com/devcontainers/python:3.13-bookworm",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
-  // Ensure .env exists before Docker Compose processes env_file entries
-  "initializeCommand": "bash \"${localWorkspaceFolder}/.devcontainer/ensure-env.sh\"",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+  },
 
-  // Start the Postgres sidecar using the existing compose file
-  "dockerComposeFile": [
-    "../docker-compose.yml",
-    "docker-compose.yml"
+  "runArgs": [
+    "--add-host=host.docker.internal:host-gateway"
   ],
-  "service": "app",
-  "runServices": ["db"],
-  "shutdownAction": "stopCompose",
 
-  // Forward common app/db ports
   "forwardPorts": [8000, 5432],
   "portsAttributes": {
     "8000": { "label": "FastAPI", "onAutoForward": "openBrowser" },
     "5432": { "label": "PostgreSQL" }
   },
 
-  // Prepare env, install uv, and sync deps
+  "initializeCommand": "bash \"${localWorkspaceFolder}/.devcontainer/ensure-env.sh\"",
+  "postStartCommand": "docker compose -f .devcontainer/docker-compose.yml up -d",
   "postCreateCommand": "bash .devcontainer/init-env.sh && curl -LsSf https://astral.sh/uv/install.sh | sh && ~/.local/bin/uv sync",
 
   "customizations": {
@@ -33,4 +30,3 @@
     }
   }
 }
-

.devcontainer/docker-compose.yml

@@ -1,25 +1,15 @@
 services:
-  app:
-    image: mcr.microsoft.com/devcontainers/python:3.13-bookworm
-    container_name: fastapi-jinja2-postgres-webapp-app
-    volumes:
-      - ..:/workspaces/${localWorkspaceFolderBasename}:cached
-    working_dir: /workspaces/${localWorkspaceFolderBasename}
-    depends_on:
-      - db
-    command: sleep infinity
-
-  # Override/augment settings for the db service defined in the root compose file
   db:
-    # Avoid requiring a project-level .env during compose evaluation
-    env_file: []
+    image: postgres:16
+    restart: unless-stopped
+    ports:
+      - "5432:5432"
     environment:
       POSTGRES_USER: ${DB_USER:-postgres}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres}
       POSTGRES_DB: ${DB_NAME:-fastapi-jinja2-postgres-webapp}
-    ports:
-      - "5432:5432"
-
-# Note: The 'db' service is defined in the repository root docker-compose.yml.
-# This file is merged with that one via devcontainer.json dockerComposeFile array.
+    volumes:
+      - pgdata:/var/lib/postgresql/data
 
+volumes:
+  pgdata:

.devcontainer/init-env.sh

@@ -13,11 +13,11 @@ if [ ! -f ".env" ]; then
   fi
 fi
 
-# Ensure DB_HOST points to the compose service name for in-container access
+# Ensure DB_HOST points to host.docker.internal for DooD sibling container access
 if grep -q '^DB_HOST=' .env; then
-  sed -i 's/^DB_HOST=.*/DB_HOST=db/' .env
+  sed -i 's/^DB_HOST=.*/DB_HOST=host.docker.internal/' .env
 else
-  echo 'DB_HOST=db' >> .env
+  echo 'DB_HOST=host.docker.internal' >> .env
 fi
 
 generate_secret() {
@@ -42,5 +42,5 @@ else
   echo "SECRET_KEY=$(generate_secret)" >> .env
 fi
 
-echo "Environment prepared. DB_HOST set to 'db' and SECRET_KEY ensured."
+echo "Environment prepared. DB_HOST set to 'host.docker.internal' and SECRET_KEY ensured."