Improve development setup

Author: medihack

.devcontainer/Dockerfile

@@ -1,11 +1,23 @@
 FROM mcr.microsoft.com/devcontainers/python:3.13
 
-# Install dependency to make bash completion work with invoke
-RUN apt-get update && \
-  export DEBIAN_FRONTEND=noninteractive && \
-  apt-get install -y bash-completion && \
-  apt-get clean && \
-  rm -rf /var/lib/apt/lists/*
+USER root
+
+# Install system dependencies
+# - bash-completion for shell completions of invoke
+# - gettext for Django translations
+# - postgresql-common for the apt.postgresql.org.sh script
+# - postgresql-client-17 for a current version of psql
+RUN sudo apt-get update \
+  && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get install -y --no-install-recommends \
+  bash-completion \
+  gettext \
+  postgresql-common \
+  && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
+  && apt-get install -y --no-install-recommends \
+  postgresql-client-17 \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 USER vscode
 

adit/settings/base.py

@@ -16,7 +16,17 @@
 import environ
 from pydicom import config as pydicom_config
 
+# During development and calling `manage.py` from the host most environment variables are
+# set using the `.env` file (see `manage.py`). But some variables are only used in the Docker
+# compose setup, so we need to provide defaults here.
 env = environ.Env()
+llamacpp_dev_port = env.int("LLAMACPP_DEV_PORT")
+postgres_dev_port = env.int("POSTGRES_DEV_PORT")
+env = environ.Env(
+    DATABASE_URL=(str, f"postgres://postgres:postgres@localhost:{postgres_dev_port}/postgres"),
+    DBBACKUP_STORAGE_LOCATION=(str, "/temp/backups-radis"),
+    LLAMACPP_URL=(str, f"http://localhost:{llamacpp_dev_port}"),
+)
 
 # The base directory of the project (the root of the repository)
 BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent

docker-compose.dev.yml

@@ -64,6 +64,8 @@ services:
   postgres:
     environment:
       POSTGRES_PASSWORD: postgres
+    ports:
+      - "${POSTGRES_DEV_PORT:-5432}:5432"
 
 volumes:
   vscode-server:

example.env

@@ -2,10 +2,12 @@
 # Use 'development' for local development, and 'production' in production.
 ENVIRONMENT=development
 
-# The host port that will be mapped to the development server (only used in development).
+# Ports that will be mapped to the host during development.
+POSTGRES_DEV_PORT=5432
+LLAMACPP_DEV_PORT=8080
 WEB_DEV_PORT=8000
 
-# The host ports that will be mapped to the production server (only used in production).
+# Ports that will be mapped to the host during production.
 WEB_HTTP_PORT=80
 WEB_HTTPS_PORT=443
 

manage.py

@@ -4,6 +4,10 @@
 import os
 import sys
 
+from dotenv import load_dotenv
+
+load_dotenv()
+
 
 def initialize_debugger():
     """Enable remote debugging."""