Updated to nested directory format

Author: smangham

.gitignore

@@ -155,4 +155,5 @@ target
 # Project
 staticfiles/
 *.csv
-*.xlsx
+*.xlsx
+*/migrations/*

Dockerfile

@@ -17,3 +17,4 @@ RUN uv run sync
 
 # Copy across the rest of the files
 COPY . .
+WORKDIR physics_workload

Makefile

@@ -121,33 +121,33 @@ print-%:
 data: site school unit task
 
 site:
-	uv run manage.py loaddata site info
+	uv run physics_workload/manage.py loaddata site info
 
 school: site
-	uv run manage.py loaddata standard_load academic_group
+	uv run physics_workload/manage.py loaddata standard_load academic_group
 
 staff: school
-	uv run manage.py shell < ./scripts/import_staff_from_csv.py
+	uv run physics_workload/manage.py shell < ./scripts/import_staff_from_csv.py
 
 unit: school
-	uv run manage.py loaddata load_function
-	uv run manage.py shell < ./scripts/import_units_from_csv.py
+	uv run physics_workload/manage.py loaddata load_function
+	uv run physics_workload/manage.py shell < ./scripts/import_units_from_csv.py
 
 task: unit staff
-	uv run manage.py shell < ./scripts/import_nonunit_tasks_from_csv.py
-	uv run manage.py shell < ./scripts/import_unit_tasks_from_csv.py
+	uv run physics_workload/manage.py shell < ./scripts/import_nonunit_tasks_from_csv.py
+	uv run physics_workload/manage.py shell < ./scripts/import_unit_tasks_from_csv.py
 
 database:
-	-rm -rf app/migrations/*.py
+	-rm -rf physics_workload/app/migrations/*.py
 	-rm data/db.sqlite3
-	touch app/migrations/__init__.py
-	uv run manage.py makemigrations
-	uv run manage.py migrate
+	touch physics_workload/app/migrations/__init__.py
+	uv run physics_workload/manage.py makemigrations
+	uv run physics_workload/manage.py migrate
 
 superuser:
-	uv run manage.py shell < ./scripts/make_swm1r18_superuser.py
+	uv run physics_workload/manage.py shell < ./scripts/make_swm1r18_superuser.py
 
 initialise:
-	uv run manage.py initialise
+	uv run physics_workload/manage.py initialise
 
 all: database data initialise

Procfile

@@ -1,19 +1,19 @@
 services:
-  physics_workload_nginx:
+  nginx:
     container_name: physics-workload-nginx
     image: nginx:latest
     ports:
       - "80:80"
       - "443:443"
     volumes:
       - type: bind
-        source: "./nginx/app.conf"
+        source: "${PROJECT_PATH}/nginx/app.conf"
         target: "/etc/nginx/conf.d/default.conf"
       - type: bind
-        source: "./nginx/"
+        source: "${PROJECT_PATH}/nginx/"
         target: "/var/www/physics-workload/nginx/"
       - type: bind
-        source: "./staticfiles/"
+        source: "${PROJECT_PATH}/staticfiles/"
         target: "/var/www/physics-workload/staticfiles/"
       - type: bind
         source: "/etc/tls/certs/"
@@ -22,34 +22,36 @@ services:
         source: "/etc/tls/private/"
         target: "/etc/tls/private/"
       - type: bind
-        source: "./logs/"
+        source: "${PROJECT_PATH}/logs/"
         target: "/var/www/physics-workload/logs/"
 
     restart: unless-stopped
     depends_on:
-      - physics_workload_django
+      - web
 
-  physics_workload_django:
+  web:
     container_name: physics-workload-django
     build:
       dockerfile: Dockerfile
       context: .
     expose:
       - "8000"
+    ports:
+      - "8000:8000"
     env_file:
       - "./.env.default"
       - "./.env"
     volumes:
       - type: bind
-        source: "./data/"
+        source: "${PROJECT_PATH}/data/"
         target: "/var/www/physics-workload/data/"
       - type: bind
-        source: "./staticfiles/"
+        source: "${PROJECT_PATH}/staticfiles/"
         target: "/var/www/physics-workload/staticfiles/"
       - type: bind
-        source: "./logs/"
+        source: "${PROJECT_PATH}/logs/"
         target: "/var/www/physics-workload/logs/"
     command:
       - "bash"
-      - "docker_entrypoint_django.sh"
+      - "docker-entrypoint.sh"
     restart: unless-stopped