feat: Wahl-Phasen, Verantwortliche-Invites, Auth fixes, GRUPPE chat #1

Merged
linus merged 28 commits from feat/backend-phases-0-6 into main 2026-09-12 11:26:16 +00:00
3 changed files with 21 additions and 17 deletions
Showing only changes of commit 4902cfe85d - Show all commits
+7 -9
View File
@@ -1,9 +1,8 @@
# syntax=docker/dockerfile:1
#
# The Flutter web bundle is built on the HOST (it needs a ~2.8 GB SDK image
# otherwise). Before `docker compose build`, run:
# (cd client/app && flutter build web --release)
# This Dockerfile just copies client/app/build/web into the runtime image.
# Server-only image (this repo has no Flutter client). The web client is
# built in the KC-APP client repo and its `build/web` output is mounted
# into the container at runtime via WEB_CLIENT_DIR (see docker-compose.yml).
# --- 1. Backend build ---------------------------------------------------------
FROM node:20-bookworm-slim AS api-build
@@ -13,9 +12,9 @@ WORKDIR /src
# openssl-1.1.x, which then fails to load in the runtime stage (openssl 3.0.x).
RUN apt-get update && apt-get install -y --no-install-recommends openssl \
&& rm -rf /var/lib/apt/lists/*
COPY backend/package.json backend/package-lock.json ./
COPY package.json package-lock.json ./
RUN npm ci
COPY backend/ ./
COPY . .
RUN npx prisma generate && npm run build
# --- 2. Runtime -------------------------------------------------------------
@@ -28,9 +27,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends openssl \
COPY --from=api-build /src/node_modules ./node_modules
COPY --from=api-build /src/dist ./dist
COPY --from=api-build /src/prisma ./prisma
# Pre-built Flutter web bundle from the host; app.module reads WEB_CLIENT_DIR.
COPY client/app/build/web ./web
ENV WEB_CLIENT_DIR=/app/web
# Web client bundle is bind-mounted at runtime, not baked into the image;
# app.module reads WEB_CLIENT_DIR. See docker-compose.yml.
EXPOSE 3000
# Apply pending migrations, then boot.
CMD ["sh", "-c", "npx prisma migrate deploy && node dist/main.js"]
+2 -2
View File
@@ -1,7 +1,7 @@
# KC-App Backend
NestJS API for the KC-App platform (see repo root README + plan for
architecture context).
NestJS API for the KC-App platform. Split out of the main KC-APP monorepo
(https://git.konfi-castle.com/linus/KC-APP); the Flutter clients live there.
## Setup
+12 -6
View File
@@ -22,21 +22,27 @@ services:
depends_on:
db:
condition: service_healthy
# All non-DB config comes from backend/.env (needs Docker Compose v2,
# which strips surrounding quotes). DATABASE_URL and the FCM credential
# path are overridden below for the container.
# All non-DB config comes from .env (needs Docker Compose v2, which
# strips surrounding quotes). DATABASE_URL and the FCM credential path
# are overridden below for the container.
env_file:
- backend/.env
- .env
environment:
DATABASE_URL: postgresql://postgres:postgres@db:5432/kcapp?schema=public
DATABASE_URL: postgresql://postgres:***@db:5432/kcapp?schema=public
PORT: "3000"
GOOGLE_APPLICATION_CREDENTIALS: /app/serviceAccount.json
APP_BASE_URL: http://localhost:3010
WEB_CLIENT_DIR: /app/web
ports:
- "3010:3000"
volumes:
# Firebase service account — kept out of the image, mounted read-only.
- ./backend/serviceAccount.json:/app/serviceAccount.json:ro
- ./serviceAccount.json:/app/serviceAccount.json:ro
# Pre-built Flutter web bundle, built separately in the KC-APP client
# repo (flutter build web --release) and mounted read-only here.
# Set WEB_CLIENT_BUILD_PATH (e.g. in .env) to that build/web directory;
# defaults to a sibling ../KC-APP checkout.
- ${WEB_CLIENT_BUILD_PATH:-../KC-APP/client/app/build/web}:/app/web:ro
volumes:
pgdata: