feat: Containerize frontend and backend services with Docker and Docker Compose, enabling environment-based API configuration.

This commit is contained in:
2025-12-23 03:34:48 +01:00
parent c441f14bfa
commit cb0ac687ca
7 changed files with 127 additions and 8 deletions

27
Dockerfile Normal file
View File

@@ -0,0 +1,27 @@
FROM rust:1.92 AS builder
WORKDIR /app
COPY . .
# Build the release binary
RUN cargo build --release -p notes-api
FROM debian:bookworm-slim
WORKDIR /app
# Install OpenSSL (required for many Rust networking crates) and CA certificates
RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/*
COPY --from=builder /app/target/release/notes-api .
# Create data directory for SQLite
RUN mkdir -p /app/data
ENV DATABASE_URL=sqlite:///app/data/notes.db
ENV SESSION_SECRET=supersecretchangeinproduction
EXPOSE 3000
CMD ["./notes-api"]

View File

@@ -1,6 +1,28 @@
#services: services:
# api: backend:
# db: build: .
ports:
- "3000:3000"
environment:
# In production, use a secure secret
- SESSION_SECRET=dev_secret_key_12345
- DATABASE_URL=sqlite:///app/data/notes.db
- CORS_ALLOWED_ORIGINS=http://localhost:8080,http://localhost:5173
- HOST=0.0.0.0
- PORT=3000
volumes:
- ./data:/app/data
frontend:
build: ./k-notes-frontend
ports:
- "8080:80"
environment:
# This sets the default backend URL for the frontend
- API_URL=http://localhost:3000
depends_on:
- backend
# Optional: Define volumes explicitly if needed
# volumes: # volumes:
# db_volume: # backend_data:

View File

@@ -0,0 +1,29 @@
# Build stage
FROM oven/bun:1 AS builder
WORKDIR /app
COPY package.json bun.lock ./
RUN bun install --frozen-lockfile
COPY . .
RUN bun run build
# Production stage
FROM nginx:alpine
# Copy built assets
COPY --from=builder /app/dist /usr/share/nginx/html
# Copy custom nginx config
COPY nginx.conf /etc/nginx/conf.d/default.conf
# Create script to generate env-config.js from environment variables
RUN echo '#!/bin/sh' > /docker-entrypoint.d/40-env-config.sh && \
echo 'echo "window.env = {" > /usr/share/nginx/html/env-config.js' >> /docker-entrypoint.d/40-env-config.sh && \
echo 'if [ -n "$API_URL" ]; then echo " API_URL: \"$API_URL\"," >> /usr/share/nginx/html/env-config.js; fi' >> /docker-entrypoint.d/40-env-config.sh && \
echo 'echo "};" >> /usr/share/nginx/html/env-config.js' >> /docker-entrypoint.d/40-env-config.sh && \
chmod +x /docker-entrypoint.d/40-env-config.sh
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

View File

@@ -5,6 +5,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/logo.png" /> <link rel="icon" type="image/png" href="/logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script src="/env-config.js"></script>
<title>K-Notes</title> <title>K-Notes</title>
</head> </head>

View File

@@ -0,0 +1,14 @@
server {
listen 80;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
# Optional: Proxy API requests if using same domain (not needed for this specific setup but good to have)
# location /api {
# proxy_pass http://backend:3000;
# }
}

View File

@@ -1,9 +1,29 @@
declare global {
interface Window {
env?: {
API_URL?: string;
};
}
}
const getApiUrl = () => { const getApiUrl = () => {
// 1. Runtime config (Docker)
if (window.env?.API_URL) {
return `${window.env.API_URL}/api/v1`;
}
// 2. LocalStorage override
const stored = localStorage.getItem("k_notes_api_url"); const stored = localStorage.getItem("k_notes_api_url");
return stored ? `${stored}/api/v1` : "http://localhost:3000/api/v1"; if (stored) {
return `${stored}/api/v1`;
}
// 3. Default fallback
return "http://localhost:3000/api/v1";
}; };
export const getBaseUrl = () => { export const getBaseUrl = () => {
if (window.env?.API_URL) {
return window.env.API_URL;
}
const stored = localStorage.getItem("k_notes_api_url"); const stored = localStorage.getItem("k_notes_api_url");
return stored ? stored : "http://localhost:3000"; return stored ? stored : "http://localhost:3000";
} }

View File

@@ -94,19 +94,25 @@ async fn main() -> anyhow::Result<()> {
.allow_credentials(true); .allow_credentials(true);
// Add allowed origins // Add allowed origins
let mut allowed_origins = Vec::new();
for origin in &config.cors_allowed_origins { for origin in &config.cors_allowed_origins {
tracing::debug!("Allowing CORS origin: {}", origin);
if let Ok(value) = origin.parse::<axum::http::HeaderValue>() { if let Ok(value) = origin.parse::<axum::http::HeaderValue>() {
cors = cors.allow_origin(value); allowed_origins.push(value);
} else { } else {
tracing::warn!("Invalid CORS origin: {}", origin); tracing::warn!("Invalid CORS origin: {}", origin);
} }
} }
if !allowed_origins.is_empty() {
cors = cors.allow_origin(allowed_origins);
}
// Build the application // Build the application
let app = Router::new() let app = Router::new()
.nest("/api/v1", routes::api_v1_router()) .nest("/api/v1", routes::api_v1_router())
.layer(cors)
.layer(auth_layer) .layer(auth_layer)
.layer(cors)
.layer(TraceLayer::new_for_http()) .layer(TraceLayer::new_for_http())
.with_state(state); .with_state(state);