— Separate builds

— Uses pre-installed uv python image
— Uses devsetup.sh functions
— Added checks to devsetup.sh for Docker compatibility
— Doesn't skip checks at migration
— Node 24 & Python 3.13
— Added missing libraries

Author: animalite

.dockerignore

@@ -88,7 +88,3 @@ temp/
 
 # OS files
 Thumbs.db
-
-# Development scripts (not needed in container)
-devsetup.sh
-devsetuph.sh

Dockerfile

@@ -103,24 +103,36 @@ pull() {
 }
 
 dependencies() {
-  source fds-env/bin/activate
-  echo "Installing $MAIN..."
-
-  uv pip install -r $MAIN/requirements-dev.txt
-  install_precommit "$MAIN"
+  # Check if running in Docker environment
+  if $DOCKER; then
+      uv pip install \
+      --no-cache \
+      --system \
+      -r ./requirements-dev.txt
+
+    for name in "${REPOS[@]}"; do
+      uv pip install --system -e "./$name" --config-setting editable_mode=compat
+    done
+  else
+    source fds-env/bin/activate
+    echo "Installing $MAIN..."
 
-  echo "Cloning / installing all editable dependencies..."
+    uv pip install -r $MAIN/requirements-dev.txt
+    install_precommit "$MAIN"
 
-  for name in "${REPOS[@]}"; do
-    uv pip install -e "./$name" --config-setting editable_mode=compat
-    install_precommit "$name"
-  done
+    echo "Cloning / installing all editable dependencies..."
+    for name in "${REPOS[@]}"; do
+      uv pip install -e "./$name" --config-setting editable_mode=compat
+      install_precommit "$name"
+    done
+  fi
 }
 
+
 dockerized() {
   pull
   docker compose build
-  docker compose run --rm django python manage.py migrate --skip-checks
+  docker compose run --rm django python manage.py migrate
 }
 
 frontend() {
@@ -150,6 +162,11 @@ frontend() {
     popd
   done
 
+  # Add a Docker-specific override
+  if $DOCKER; then
+    MAIN="."
+  fi
+
   # Setup main project and link dependencies
   pushd "$MAIN"
   pnpm install

devsetup.sh

@@ -1,6 +1,8 @@
 services:
   django:
-    build: .
+    build:
+      context: .
+      dockerfile: ./docker/django/Dockerfile
     command: >
       bash -c "python manage.py runserver"
     network_mode: "host"
@@ -12,13 +14,14 @@ services:
       - elasticsearch
 
   frontend:
-    build: .
-    command: >
-      bash -c "pnpm run dev"
-    network_mode: "host"
-    volumes:
-      - .:/app
-      - /app/node_modules
+      build:
+        context: .
+        dockerfile: ./docker/frontend/Dockerfile
+      command: "pnpm run dev"
+      network_mode: "host"
+      volumes:
+        - .:/app
+        - /app/node_modules
 
   db:
     image: postgis/postgis:16-3.4

docker-compose.yml

@@ -0,0 +1,47 @@
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    DJANGO_SETTINGS_MODULE=fragdenstaat_de.settings.development \
+    DJANGO_CONFIGURATION=Dev \
+    SHELL=/bin/bash \
+    DOCKER=true
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    postgresql-client \
+    postgis \
+    gettext \
+    gdal-bin \
+    libgdal-dev \
+    libpq-dev \
+    build-essential \
+    inotify-tools \
+    curl \
+    # Specific dependencies from README
+    imagemagick \
+    libmagickwand-dev \
+    libfreetype6-dev \
+    poppler-utils \
+    qpdf \
+    ocrmypdf \
+    libpango1.0-dev \
+    libgeoip-dev \
+    libmagic-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set work directory
+WORKDIR /app
+
+# Copy entire project
+COPY . .
+
+# Install repo dependencies
+RUN chmod +x ./devsetup.sh && \
+    ./devsetup.sh dependencies
+
+# Compile messages
+RUN python manage.py compilemessages -l de -i node_modules
+
+EXPOSE 8000

docker/django/Dockerfile

@@ -0,0 +1,28 @@
+FROM node:24-bookworm-slim
+
+# Set up pnpm home directory
+ENV PNPM_HOME="/root/.local/share/pnpm"
+ENV PATH="${PNPM_HOME}:${PATH}"
+ENV DOCKER=true
+
+# Enable corepack
+RUN corepack enable
+
+# Set work directory
+WORKDIR /app
+
+# Copy content
+COPY . ./
+
+# Dynamically prepare pnpm version and activate
+RUN pnpm_version=$(node -p "require('./package.json').packageManager?.replace('pnpm@', '')") && \
+    echo "Using pnpm version: $pnpm_version" && \
+    corepack prepare "pnpm@$pnpm_version" --activate
+
+# Install dependencies and run frontend setup
+RUN chmod +x ./devsetup.sh && \
+    ./devsetup.sh frontend
+
+EXPOSE 5173
+
+CMD ["pnpm", "run", "dev"]

docker/frontend/Dockerfile

@@ -36,7 +36,7 @@ Django will be listening on http://localhost:8000, Vite on http://localhost:5173
 
 ### Initial setup
 
-devsetup.sh automatically runs `python manage.py migrate --skip-checks` after build. However, you may still need to:
+devsetup.sh automatically runs `python manage.py migrate` after build. However, you may still need to:
 
 1. Create a superuser
 ``` bash