fix bug in initial db creation caused by prometheus lib rtying to access tables at load time

core/core/metrics.py

@@ -3,18 +3,20 @@ from prometheus_client.core import CounterMetricFamily, REGISTRY
 from django.db.models import Case, Value, When, BooleanField, Count
 from inventory.models import Item
 
+
 class ItemCountCollector(object):
 
     def collect(self):
-        counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'returned_state'])
+        try:
+            counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'returned_state'])
 
-        yield counter
+            yield counter
 
-        if not apps.models_ready or not apps.apps_ready:
+            if not apps.models_ready or not apps.apps_ready:
-            return
+                return
 
-        queryset = (
+            queryset = (
-            Item.all_objects
+                Item.all_objects
                 .annotate(
                     returned=Case(
                         When(returned_at__isnull=True, then=Value(False)),
@@ -25,11 +27,14 @@ class ItemCountCollector(object):
                 .values('event__slug', 'returned', 'event_id')
                 .annotate(amount=Count('id'))
                 .order_by('event__slug', 'returned')  # Optional: order by slug and returned
-        )
+            )
 
-        for e in queryset:
+            for e in queryset:
-            counter.add_metric([e["event__slug"].lower(), str(e["returned"])], e["amount"])
+                counter.add_metric([e["event__slug"].lower(), str(e["returned"])], e["amount"])
 
-        yield counter
+            yield counter
+        except:
+            pass
 
-REGISTRY.register(ItemCountCollector())
+
+REGISTRY.register(ItemCountCollector())

deploy/dev/Dockerfile.backend

@@ -1,13 +1,8 @@
-FROM python:3.11-bookworm
+FROM python:3.11-slim-bookworm
 LABEL authors="lagertonne"
 
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /code
 WORKDIR /code
 COPY requirements.dev.txt /code/
-COPY requirements.prod.txt /code/
+RUN pip install -r requirements.dev.txt
-RUN apt update && apt install -y mariadb-client
-RUN pip install -r requirements.dev.txt
-RUN pip install -r requirements.prod.txt
-RUN pip install mysqlclient
-COPY .. /code/

deploy/dev/Dockerfile.frontend

@@ -1,4 +1,4 @@
-FROM docker.io/node:22
+FROM node:22-alpine
 
 RUN mkdir /web
 WORKDIR /web

deploy/dev/docker-compose.yml

@@ -1,3 +1,4 @@
+name: c3lf-sys3-dev
 services:
   core:
     build:
@@ -6,11 +7,12 @@ services:
     command: bash -c 'python manage.py migrate && python testdata.py && python manage.py runserver 0.0.0.0:8000'
     environment:
       - HTTP_HOST=core
-      - DB_FILE=dev.db
+      - DB_FILE=.local/dev.db
       - DEBUG_MODE_ACTIVE=true
     volumes:
-      - ../../core:/code
+      - ../../core:/code:ro
-      - ../testdata.py:/code/testdata.py
+      - ../testdata.py:/code/testdata.py:ro
+      - backend_context:/code/.local
     ports:
       - "8000:8000"
 
@@ -20,10 +22,12 @@ services:
       dockerfile: ../deploy/dev/Dockerfile.frontend
     command: npm run serve
     volumes:
-      - ../../web:/web:ro
+      - ../../web/src:/web/src
-      - /web/node_modules
       - ./vue.config.js:/web/vue.config.js
     ports:
       - "8080:8080"
     depends_on:
       - core
+
+volumes:
+  backend_context:

deploy/testing/Dockerfile.backend

@@ -1,11 +1,11 @@
-FROM python:3.11-bookworm
+FROM python:3.11-slim-bookworm
 LABEL authors="lagertonne"
 
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /code
 WORKDIR /code
-COPY requirements.prod.txt /code/
+RUN apt update && apt install -y pkg-config mariadb-client default-libmysqlclient-dev build-essential
-RUN apt update && apt install -y mariadb-client
-RUN pip install -r requirements.prod.txt
 RUN pip install mysqlclient
+COPY requirements.prod.txt /code/
+RUN pip install -r requirements.prod.txt
 COPY .. /code/

deploy/testing/Dockerfile.frontend

@@ -1,4 +1,4 @@
-FROM docker.io/node:22
+FROM node:22-alpine
 
 RUN mkdir /web
 WORKDIR /web

deploy/testing/docker-compose.yml

@@ -1,3 +1,4 @@
+name: c3lf-sys3-testing
 services:
   redis:
     image: redis
@@ -31,8 +32,9 @@ services:
       - DB_PASSWORD=system3
       - MAIL_DOMAIN=mail:1025
     volumes:
-      - ../../core:/code
+      - ../../core:/code:ro
-      - ../testdata.py:/code/testdata.py
+      - ../testdata.py:/code/testdata.py:ro
+      - backend_context:/code
     ports:
       - "8000:8000"
     depends_on:
@@ -47,8 +49,8 @@ services:
     command: npm run serve
     volumes:
       - ../../web:/web:ro
-      - /web/node_modules
+      - ./vue.config.js:/web/vue.config.js:ro
-      - ./vue.config.js:/web/vue.config.js
+      - frontend_context:/web
     ports:
       - "8080:8080"
     depends_on:
@@ -70,3 +72,5 @@ services:
 volumes:
   mariadb_data:
   mailpit_data:
+  frontend_context:
+  backend_context: