merge conflicts

dailytxt/docker-compose.yml

@@ -24,3 +24,13 @@ services:
       # "<host_port>:8765"
     volumes:
       - "/home/soenke/docker-data/dailytxt/:/app/data/"
+    labels:
+      kuma.tools.tag.name: 'Tools'
+      kuma.tools.tag.color: '#FF9900'
+      kuma.work.tag.name: 'Work'
+      kuma.work.tag.color: '#FF9955'
+      kuma.organization.tag.name: 'Organization'
+      kuma.organization.tag.color: '#FF99AA'
+      kuma.dailytxt.http.name: 'DailyTxT'
+      kuma.dailytxt.http.url: 'https://dailytxt.domr.ovh'
+      kuma.dailytxt.http.tag_names: '[{"name": "tools", "value": "" }, {"name": "homelab", "value": "" }]'

journiv/docker-compose.yml

@@ -168,6 +168,16 @@ services:
           memory: 2g
         reservations:
           memory: 512m
+    labels:
+      kuma.tools.tag.name: 'Tools'
+      kuma.tools.tag.color: '#FF9900'
+      kuma.journiv.tag.name: 'Work'
+      kuma.journiv.tag.color: '#FF9955'
+      kuma.organization.tag.name: 'Organization'
+      kuma.organization.tag.color: '#FF99AA'
+      kuma.journiv.http.name: 'journiv'
+      kuma.journiv.http.url: 'https://journiv.domr.ovh'
+      kuma.journiv.http.tag_names: '[{"name": "tools", "value": "" }, {"name": "homelab", "value": "" }]'
 
 #volumes:
 #  app_data: