Load admin-index fixtures in docker startup script

bin/docker_start.sh

@@ -7,7 +7,7 @@ set -ex
 export PGHOST=${DB_HOST:-db}
 export PGPORT=${DB_PORT:-5432}
 
-fixtures_dir=${FIXTURES_DIR:-/app/fixtures}
+fixtures_dir=${FIXTURES_DIR:-/app/src/open_inwoner/conf/fixtures/autoload}
 
 uwsgi_port=${UWSGI_PORT:-8000}
 uwsgi_processes=${UWSGI_PROCESSES:-4}
@@ -24,6 +24,17 @@ done
 >&2 echo "Apply database migrations"
 python src/manage.py migrate
 
+# Load JSON fixtures
+if [ -d $fixtures_dir ]; then
+    echo "Loading fixtures from $fixtures_dir"
+
+    for fixture in $(ls "$fixtures_dir/"*.json)
+    do
+        echo "Loading fixture $fixture"
+        python src/manage.py loaddata $fixture
+    done
+fi
+
 # Start server
 >&2 echo "Starting server"
 exec uwsgi \

bin/generate_admin_index_fixture.sh

@@ -9,3 +9,6 @@
 # Run this script from the root of the repository
 
 src/manage.py dumpdata --indent=4 --natural-foreign --natural-primary admin_index.AppGroup admin_index.AppLink > src/open_inwoner/conf/fixtures/django-admin-index.json
+
+# copy admin-index fixture to autoload dir
+cp src/open_inwoner/conf/fixtures/django-admin-index.json src/open_inwoner/conf/fixtures/autoload/

docker-compose.yml

@@ -8,10 +8,10 @@ services:
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-      - ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql
+      # - ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql
       - db:/var/lib/postgresql/data
     networks:
-      - openinwoner-dev    
+      - openinwoner-dev
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
@@ -21,7 +21,7 @@ services:
       - cluster.routing.allocation.disk.threshold_enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     networks:
-      - openinwoner-dev         
+      - openinwoner-dev
     volumes:
       - es_data:/usr/share/elasticsearch/data
     ports:
@@ -58,7 +58,7 @@ services:
       - CACHE_PORTALOCKER=redis:6379/0
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
-      - CELERY_LOGLEVEL=DEBUG      
+      - CELERY_LOGLEVEL=DEBUG
       - ES_HOST=elasticsearch
       - DISABLE_2FA=${DISABLE_2FA:-True}
       - DEBUG=True
@@ -107,4 +107,4 @@ volumes:
 
 networks:
   openinwoner-dev:
-    name: openinwoner-dev
+    name: openinwoner-dev

src/open_inwoner/accounts/apps.py

@@ -4,7 +4,8 @@
 from django.conf import settings
 from django.contrib.contenttypes.management import create_contenttypes
 from django.core.management import call_command
-from django.db.models.signals import post_migrate
+
+# from django.db.models.signals import post_migrate
 
 
 def update_admin_index(sender=None, **kwargs) -> bool:
@@ -48,4 +49,9 @@ def ready(self):
             return
         self._has_run = True
 
-        post_migrate.connect(update_admin_index, sender=self)
+        # FIXME: loading the django-admin-index fixture through the
+        # post migrate signal is broken; we now load the fixture
+        # in the docker startup script, so this only affects manual
+        # installs during development;
+
+        # post_migrate.connect(update_admin_index, sender=self)