fix: Fix database initialisation in docker compose for sqlite and postgres

Author: natkam

examples/docker_compose/Dockerfile-DBInit

@@ -17,4 +17,4 @@ RUN python3 -m venv /venv
 # Activate venv and install the package
 RUN /venv/bin/pip install .
 
-CMD ["sh", "-c", "/app/init-db.sh"]
+CMD ["sh", "-c", "/app/init-db-postgres.sh"]

examples/docker_compose/Dockerfile-Hub

@@ -14,4 +14,4 @@ RUN pip install grader_labextension
 
 RUN python3 -m pip install dockerspawner oauthenticator
 
-CMD ["jupyterhub", "-f", "/app/jupyterhub_config.py"]
+CMD ["jupyterhub", "-f", "/app/jupyterhub_config.py"]

examples/docker_compose/Dockerfile-Service

@@ -2,7 +2,7 @@ FROM python:3.13-slim
 
 # Install git
 RUN apt-get update && \
-    apt-get install -y git && \
+    apt-get install -y git sqlite3 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

examples/docker_compose/docker-compose-postgres.yml

@@ -1,4 +1,8 @@
 services:
+
+  service:
+    command: []  # Use the default CMD from Dockerfile-Service, i.e. just apply migrations
+
   db-init:
     build:
       context: ../..
@@ -9,7 +13,7 @@ services:
     volumes:
       - ./grader_service_config.py:/app/grader_service_config.py
       - ./data_only.sql:/app/data_only.sql
-      - ./init-db.sh:/app/init-db.sh
+      - ./init-db-postgres.sh:/app/init-db-postgres.sh
     depends_on:
       postgres:
         condition: service_healthy

examples/docker_compose/docker-compose.yml

@@ -5,9 +5,15 @@ services:
     build:
       context: ../..
       dockerfile: examples/docker_compose/Dockerfile-Service
+    command: bash -c "
+        /app/init-db.sh
+        && grader-service -f /app/grader_service_config.py
+      "
     volumes:
       - ./grader_service_config.py:/app/grader_service_config.py
       - service_dir:/app/service_dir
+      - ./init-db.sh:/app/init-db.sh
+      - ./data_only.sql:/app/data_only.sql
     environment:
       DATABASE_TYPE: ${DATABASE_TYPE:-sqlite}
       RABBITMQ_GRADER_SERVICE_USERNAME: grader_user

examples/docker_compose/init-db-postgres.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Initialize a PostgreSQL database: run migrations and load initial data.
+set -e
+
+/venv/bin/grader-service-migrate -f /app/grader_service_config.py
+# Try to load the initial data. This will fail on the first error (e.g. if the data already exists)
+# and roll back the transaction.
+psql -v ON_ERROR_STOP=1 -h postgres -U postgres -d grader --single-transaction -f /app/data_only.sql

examples/docker_compose/init-db.sh

@@ -1,4 +1,8 @@
+#!/usr/bin/env bash
+# Initialize an sqlite database: run migrations and load initial data.
+set -e
 
-/venv/bin/grader-service-migrate -f /app/grader_service_config.py
-
-psql -h postgres -U postgres -d grader -f /app/data_only.sql
+grader-service-migrate -f /app/grader_service_config.py
+# Insert some initial data into the database. The import will fail if the data already
+#  has been inserted, so we ignore errors and just continue.
+sqlite3 /app/service_dir/grader.db < /app/data_only.sql || true