This commit is contained in:
2025-11-30 15:57:28 +01:00
parent cfb619f3c3
commit 3fbf904a6c
2 changed files with 11 additions and 8 deletions

View File

@@ -1,5 +1,9 @@
networks: networks:
loki: null loki: null
volumes:
grafana-data:
grafana-certs:
services: services:
grafana: grafana:
entrypoint: entrypoint:
@@ -31,11 +35,11 @@ services:
networks: networks:
- loki - loki
ports: ports:
- 3000:3007 - 3007:3000
user: 0:0 user: 0:0
volumes: volumes:
- /share/docker_data/grafana/data:/var/lib/grafana - grafana-data:/var/lib/grafana
- /share/docker_data/grafana/certs:/certs - grafana-certs:/certs
deploy: deploy:
labels: labels:
com.centurylinklabs.watchtower.enable: 'true' com.centurylinklabs.watchtower.enable: 'true'
@@ -45,7 +49,7 @@ services:
homepage.href: https://g.sectorq.eu homepage.href: https://g.sectorq.eu
homepage.icon: grafana.png homepage.icon: grafana.png
homepage.name: Grafana homepage.name: Grafana
homepage.server: my-docker homepage.server: my-docker-swarm
homepage.weight: '1' homepage.weight: '1'
wud.watch: 'true' wud.watch: 'true'
wud.watch.digest: 'true' wud.watch.digest: 'true'
@@ -76,7 +80,6 @@ services:
volumes: volumes:
- /var/log:/var/log - /var/log:/var/log
- /share/docker_data/grafana/promtail/config.yml:/etc/promtail/config.yml - /share/docker_data/grafana/promtail/config.yml:/etc/promtail/config.yml
- /share/Data/__GITLAB/omv_backup/:/share/Data/__GITLAB/omv_backup/
deploy: deploy:
labels: labels:
wud.watch: 'true' wud.watch: 'true'

View File

@@ -47,7 +47,7 @@ def ensure_labels_as_string(labels):
def convert_compose_to_swarm(data): def convert_compose_to_swarm(data):
services = data.get("services", {}) services = data.get("services", {})
input(services) #input(services)
for name, svc in services.items(): for name, svc in services.items():
print(f"Converting service: {name} , svc: {svc}") print(f"Converting service: {name} , svc: {svc}")
if name in ["container_name", "restart", "depends_on"]: if name in ["container_name", "restart", "depends_on"]:
@@ -85,7 +85,7 @@ def convert_compose_to_swarm(data):
# 6) Convert ports to long format # 6) Convert ports to long format
if "ports" in svc: if "ports" in svc:
input(svc) #input(svc)
svc["ports"] = convert_ports(svc["ports"]) svc["ports"] = convert_ports(svc["ports"])
# 7) Remove container_name (not allowed in Swarm) # 7) Remove container_name (not allowed in Swarm)
@@ -96,7 +96,7 @@ def convert_compose_to_swarm(data):
def main(): def main():
with open(INPUT_FILE, "r") as f: with open(INPUT_FILE, "r") as f:
compose = yaml.safe_load(f) compose = yaml.safe_load(f)
input(compose) #input(compose)
swarm = convert_compose_to_swarm(compose) swarm = convert_compose_to_swarm(compose)
with open(OUTPUT_FILE, "w") as f: with open(OUTPUT_FILE, "w") as f: