Compare commits

..

4 Commits

Author SHA1 Message Date
523b991493 Media files (diagrams) should now be served regardless of debug mode.
Some checks failed
SonarQube Scan / SonarQube Trigger (push) Has been cancelled
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 28s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 7s
2026-01-27 12:58:07 +01:00
310c4fdd0b Changed user-id to 99 to comply with NFS-mount
Some checks failed
SonarQube Scan / SonarQube Trigger (push) Failing after 10s
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 8s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 8s
2026-01-27 11:35:08 +01:00
353a8a5697 Bug in Referenzen fixed
Some checks failed
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 16s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 4s
SonarQube Scan / SonarQube Trigger (push) Failing after 5s
2026-01-20 10:36:16 +01:00
f1d3c88a45 Merge pull request 'upgrade/django6' (#17) from upgrade/django6 into development
Some checks failed
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 4s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 4s
SonarQube Scan / SonarQube Trigger (push) Failing after 5s
Reviewed-on: #17
2026-01-20 09:21:43 +00:00
5 changed files with 9 additions and 5 deletions

View File

@@ -8,7 +8,7 @@ COPY requirements.txt /app/
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt
FROM python:3.15-rc-slim-trixie FROM python:3.15-rc-slim-trixie
RUN useradd -m -r appuser && \ RUN useradd -m -r -u 99 appuser && \
mkdir /app && \ mkdir /app && \
chown -R appuser /app chown -R appuser /app

View File

@@ -41,6 +41,7 @@ urlpatterns = [
] ]
# Serve media files (including cached diagrams) # Serve media files (including cached diagrams)
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG: if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

View File

@@ -19,13 +19,15 @@ spec:
initContainers: initContainers:
- name: loader - name: loader
image: git.baumann.gr/adebaumann/vui-data-loader:0.11 image: git.baumann.gr/adebaumann/vui-data-loader:0.11
securityContext:
runAsUser: 99
command: [ "sh","-c","if [ ! -f /data/db.sqlite3 ] || [ ! -s /data/db.sqlite3 ]; then cp preload/preload.sqlite3 /data/db.sqlite3 && echo 'Database copied from preload'; else echo 'Existing database preserved'; fi" ] command: [ "sh","-c","if [ ! -f /data/db.sqlite3 ] || [ ! -s /data/db.sqlite3 ]; then cp preload/preload.sqlite3 /data/db.sqlite3 && echo 'Database copied from preload'; else echo 'Existing database preserved'; fi" ]
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /data mountPath: /data
containers: containers:
- name: web - name: web
image: git.baumann.gr/adebaumann/vui:0.983 image: git.baumann.gr/adebaumann/vui:0.986
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
runAsUser: 99 runAsUser: 99

View File

@@ -219,7 +219,7 @@
</p> </p>
</div> </div>
<div class="col-sm-6 text-right"> <div class="col-sm-6 text-right">
<p class="text-muted">Version {{ version|default:"0.983" }}</p> <p class="text-muted">Version {{ version|default:"0.986" }}</p>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -1,6 +1,7 @@
from django.shortcuts import render from django.shortcuts import render
from .models import Referenz from .models import Referenz
from abschnitte.utils import render_textabschnitte from abschnitte.utils import render_textabschnitte
from django.shortcuts import get_object_or_404
# Create your views here. # Create your views here.
def tree(request): def tree(request):
@@ -9,7 +10,7 @@ def tree(request):
def detail(request, refid): def detail(request, refid):
referenz_item = Referenz.objects.get_object_or_404(id=refid) referenz_item = get_object_or_404(Referenz, id=refid)
referenz_item.erklaerung = render_textabschnitte(referenz_item.referenzerklaerung_set.order_by("order")) referenz_item.erklaerung = render_textabschnitte(referenz_item.referenzerklaerung_set.order_by("order"))
referenz_item.children = list(referenz_item.get_descendants(include_self=True)) referenz_item.children = list(referenz_item.get_descendants(include_self=True))
for child in referenz_item.children: for child in referenz_item.children: