Compare commits
16 Commits
94f381c02f
...
db06ae0630
| Author | SHA1 | Date | |
|---|---|---|---|
| db06ae0630 | |||
| 6afc9f8f4e | |||
| 5e0616dc6c | |||
| a55736f736 | |||
| d97a66690a | |||
| 784fbea088 | |||
| 6e8a978ae5 | |||
| 2065d69a80 | |||
| dbd75f9e30 | |||
| 077b376953 | |||
| 7c1b89a13b | |||
| b0bfb4a38a | |||
| 244e9e155f | |||
| bba32d08e3 | |||
| 4b257bae44 | |||
| 89f427462d |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -7,5 +7,7 @@ bin/
|
|||||||
pyvenv.cfg
|
pyvenv.cfg
|
||||||
include/
|
include/
|
||||||
keys/
|
keys/
|
||||||
|
.venv/
|
||||||
|
.idea/
|
||||||
|
|
||||||
*.kate-swp
|
*.kate-swp
|
||||||
|
|||||||
12
argocd/001_pvc.yaml
Normal file
12
argocd/001_pvc.yaml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
metadata:
|
||||||
|
name: django-data-pvc
|
||||||
|
namespace: vorgabenui
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 2Gi
|
||||||
|
|
||||||
@@ -16,9 +16,16 @@ spec:
|
|||||||
securityContext:
|
securityContext:
|
||||||
fsGroup: 999
|
fsGroup: 999
|
||||||
fsGroupChangePolicy: "OnRootMismatch"
|
fsGroupChangePolicy: "OnRootMismatch"
|
||||||
|
initContainers:
|
||||||
|
- name: loader
|
||||||
|
image: git.baumann.gr/adebaumann/vgui-data-loader:0.5
|
||||||
|
command: [ "sh","-c","cp -n preload/preload.sqlite3 /data/db.sqlite3; chown -R 999:999 /data; ls -la /data; sleep 10; exit 0" ]
|
||||||
|
volumeMounts:
|
||||||
|
- name: data
|
||||||
|
mountPath: /data
|
||||||
containers:
|
containers:
|
||||||
- name: web
|
- name: web
|
||||||
image: git.baumann.gr/adebaumann/vui:0.924
|
image: git.baumann.gr/adebaumann/vui:0.926
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kroki
|
- name: kroki
|
||||||
image: docker.io/yuzutech/kroki:latest
|
image: git.baumann.gr/adebaumann/kroki:0.026
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
@@ -35,15 +35,15 @@ spec:
|
|||||||
timeoutSeconds: 2
|
timeoutSeconds: 2
|
||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
- name: mermaid
|
- name: mermaid
|
||||||
image: docker.io/yuzutech/kroki-mermaid:latest
|
image: git.baumann.gr/adebaumann/kroki-mermaid:0.026
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8002
|
- containerPort: 8002
|
||||||
- name: bpmn
|
- name: bpmn
|
||||||
image: docker.io/yuzutech/kroki-bpmn:latest
|
image: git.baumann.gr/adebaumann/kroki-bpmn:0.026
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8003
|
- containerPort: 8003
|
||||||
- name: excalidraw
|
- name: excalidraw
|
||||||
image: docker.io/yuzutech/kroki-excalidraw:latest
|
image: git.baumann.gr/adebaumann/kroki-excalidraw:0.026
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8004
|
- containerPort: 8004
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -8,5 +8,4 @@ RUN chown appuser:appuser /preload/preload.sqlite3
|
|||||||
RUN mkdir /data
|
RUN mkdir /data
|
||||||
RUN chown appuser:appuser /data
|
RUN chown appuser:appuser /data
|
||||||
USER root
|
USER root
|
||||||
CMD ["sh"]
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
data/db.sqlite3
BIN
data/db.sqlite3
Binary file not shown.
@@ -7,8 +7,8 @@ spec:
|
|||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
containers:
|
containers:
|
||||||
- name: loader
|
- name: loader
|
||||||
image: adebaumann/vgui-preloader:0.4
|
image: adebaumann/vgui-preloader:0.5
|
||||||
command: ["sh","-c","cp -v /preload/preload.sqlite3 /data/db.sqlite3; chown -R 999:999 /data; ls -la /data"]
|
command: ["sh","-c","cp -v --debug --update=none /preload/preload.sqlite3 /data/db.sqlite3; chown -R 999:999 /data; ls -la /data; exit 0"]
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
|
|||||||
@@ -16,6 +16,13 @@ spec:
|
|||||||
securityContext:
|
securityContext:
|
||||||
fsGroup: 999
|
fsGroup: 999
|
||||||
fsGroupChangePolicy: "OnRootMismatch"
|
fsGroupChangePolicy: "OnRootMismatch"
|
||||||
|
initContainers:
|
||||||
|
- name: loader
|
||||||
|
image: adebaumann/vgui-preloader:0.5
|
||||||
|
command: [ "sh","-c","cp -v --debug --update=none /preload/preload.sqlite3 /data/db.sqlite3; chown -R 999:999 /data; ls -la /data; exit 0" ]
|
||||||
|
volumeMounts:
|
||||||
|
- name: data
|
||||||
|
mountPath: /data
|
||||||
containers:
|
containers:
|
||||||
- name: web
|
- name: web
|
||||||
image: docker.io/adebaumann/vui:0.917
|
image: docker.io/adebaumann/vui:0.917
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
"""Django's command-line utility for administrative tasks."""
|
"""Django's command-line utility for administrative tasks."""
|
||||||
import os
|
import os
|
||||||
|
|||||||
@@ -28,6 +28,6 @@
|
|||||||
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
||||||
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
||||||
</div>
|
</div>
|
||||||
<div>VorgabenUI v0.81</div>
|
<div>VorgabenUI v0.926</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 5.2.5 on 2025-10-06 11:29
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('standards', '0006_rename_standard_dokument_alter_dokument_options'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='changelog',
|
||||||
|
options={'verbose_name': 'Changelog-Eintrag', 'verbose_name_plural': 'Changelog'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='checklistenfrage',
|
||||||
|
options={'verbose_name': 'Frage für Checkliste', 'verbose_name_plural': 'Fragen für Checkliste'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='dokumententyp',
|
||||||
|
options={'verbose_name': 'Dokumententyp', 'verbose_name_plural': 'Dokumententypen'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='vorgabelangtext',
|
||||||
|
options={'verbose_name': 'Langtext-Abschnitt', 'verbose_name_plural': 'Langtext'},
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -81,17 +81,17 @@ class Vorgabe(models.Model):
|
|||||||
|
|
||||||
return "expired" if not verbose else "Ist seit dem "+self.gueltigkeit_bis.strftime('%d.%m.%Y')+" nicht mehr in Kraft."
|
return "expired" if not verbose else "Ist seit dem "+self.gueltigkeit_bis.strftime('%d.%m.%Y')+" nicht mehr in Kraft."
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"{self.Vorgabennummer()}: {self.titel}"
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name_plural="Vorgaben"
|
verbose_name_plural="Vorgaben"
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return f"{self.Vorgabennummer()}: {self.titel}"
|
|
||||||
|
|
||||||
class VorgabeLangtext(Textabschnitt):
|
class VorgabeLangtext(Textabschnitt):
|
||||||
abschnitt=models.ForeignKey(Vorgabe,on_delete=models.CASCADE)
|
abschnitt=models.ForeignKey(Vorgabe,on_delete=models.CASCADE)
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name_plural="Langtext-Abschnitte"
|
verbose_name_plural="Langtext"
|
||||||
verbose_name="Langtext-Abschnitt"
|
verbose_name="Langtext-Abschnitt"
|
||||||
|
|
||||||
class VorgabeKurztext(Textabschnitt):
|
class VorgabeKurztext(Textabschnitt):
|
||||||
@@ -121,6 +121,7 @@ class Checklistenfrage(models.Model):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name_plural="Fragen für Checkliste"
|
verbose_name_plural="Fragen für Checkliste"
|
||||||
|
verbose_name="Frage für Checkliste"
|
||||||
|
|
||||||
class Changelog(models.Model):
|
class Changelog(models.Model):
|
||||||
dokument = models.ForeignKey(Dokument, on_delete=models.CASCADE, related_name='changelog')
|
dokument = models.ForeignKey(Dokument, on_delete=models.CASCADE, related_name='changelog')
|
||||||
@@ -130,3 +131,7 @@ class Changelog(models.Model):
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.datum} – {self.dokument.nummer}"
|
return f"{self.datum} – {self.dokument.nummer}"
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name_plural="Changelog"
|
||||||
|
verbose_name="Changelog-Eintrag"
|
||||||
|
|||||||
Reference in New Issue
Block a user