diff --git a/Dockerfile.docs b/Dockerfile.docs
new file mode 100644
index 0000000..0b9fd4a
--- /dev/null
+++ b/Dockerfile.docs
@@ -0,0 +1,18 @@
+FROM oven/bun:1.1-alpine AS builder
+
+WORKDIR /app/docs
+
+COPY docs/package.json ./
+RUN bun install
+
+COPY docs ./
+RUN bun run build
+
+FROM nginx:alpine
+
+COPY --from=builder /app/docs/dist /usr/share/nginx/html
+COPY docs/nginx.conf /etc/nginx/http.d/default.conf
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e830fe..dc1aa73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,5 +25,15 @@ services:
       timeout: 10s
       retries: 3
 
+  docs:
+    build:
+      context: .
+      dockerfile: Dockerfile.docs
+    ports:
+      - "4000:80"
+    restart: unless-stopped
+    profiles:
+      - docs
+
 volumes:
   deardiary_data:
diff --git a/docs/nginx.conf b/docs/nginx.conf
new file mode 100644
index 0000000..085bde1
--- /dev/null
+++ b/docs/nginx.conf
@@ -0,0 +1,28 @@
+server {
+    listen 80;
+    server_name _;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Starlight static site
+    location / {
+        try_files $uri $uri/ $uri.html =404;
+    }
+
+    # SPA fallback for client-side routing
+    location ~ ^/[^.]+$ {
+        try_files $uri $uri.html =404;
+    }
+
+    # Cache static assets
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+
+    # Security headers
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+}
diff --git a/docs/src/content/docs/deployment/docker.mdx b/docs/src/content/docs/deployment/docker.mdx
index d87b94e..b5e29c6 100644
--- a/docs/src/content/docs/deployment/docker.mdx
+++ b/docs/src/content/docs/deployment/docker.mdx
@@ -91,3 +91,20 @@ DATABASE_URL="postgresql://user:pass@host:5432/deardiary"
 ### Backup
 
 Regularly backup `./data/` directory.
+
+## Documentation Site
+
+Run the documentation site with Docker:
+
+```bash
+# Start just the docs site
+docker compose --profile docs up -d
+
+# Access at http://localhost:4000
+```
+
+Build the docs Docker image separately:
+
+```bash
+docker build -f Dockerfile.docs -t deardiary-docs .
+```
diff --git a/docs/src/content/docs/getting-started/installation.mdx b/docs/src/content/docs/getting-started/installation.mdx
index 470803b..fc95673 100644
--- a/docs/src/content/docs/getting-started/installation.mdx
+++ b/docs/src/content/docs/getting-started/installation.mdx
@@ -47,6 +47,17 @@ Change these credentials immediately after first login!
 |---------|------|-------------|
 | App | 8080 | Main application (nginx) |
 | API | 3000 | Backend API (internal) |
+| Docs | 4000 | Documentation site (optional, run with `--profile docs`) |
+
+## Documentation Site
+
+Run the documentation site separately:
+
+```bash
+docker compose --profile docs up -d
+```
+
+Access at `http://localhost:4000`
 
 ## Data Storage