From c58cccd31c36b82a6f95d9fe845b2393c51f1d9875fdc9873622d26b06b9478d Mon Sep 17 00:00:00 2001 From: Christian Camper Date: Tue, 13 Jan 2026 16:55:51 -0600 Subject: [PATCH] sync --- src/docker_compose/__init__.py | 2 +- src/docker_compose/__main__.py | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/docker_compose/__init__.py b/src/docker_compose/__init__.py index 7fb6820..7db5cf8 100644 --- a/src/docker_compose/__init__.py +++ b/src/docker_compose/__init__.py @@ -1,6 +1,6 @@ from pathlib import Path ROOT = Path("/nas") -TEMPLATE_ROOT = ROOT.joinpath("templates") +TEMPLATE_ROOT = ROOT.joinpath("docker_templates") APP_ROOT = ROOT.joinpath("apps") TRAEFIK_PATH = TEMPLATE_ROOT.joinpath("traefik") diff --git a/src/docker_compose/__main__.py b/src/docker_compose/__main__.py index 28cd370..bec333f 100644 --- a/src/docker_compose/__main__.py +++ b/src/docker_compose/__main__.py @@ -15,14 +15,15 @@ def render_all() -> Iterator[str]: if __name__ == "__main__": - renderers = RenderByOrg.from_path(TRAEFIK_PATH) - traefik =renderers["util"] - data = traefik.template.compose_data.as_dict - nets = frozenset(render_all()) - data["networks"] = {net: NetArgsYaml(name=f"{net}_proxy") for net in nets} - data["services"]["traefik"]["networks"] = nets - data = cast(TypeYamlCompatibleDict, cast(object, data)) - - txt = traefik.write(to_yaml(data), render=True) - renderers.write_bind_vol_data() - traefik.bind_vols() + _ = render_all() + # renderers = RenderByOrg.from_path(TRAEFIK_PATH) + # traefik =renderers["util"] + # data = traefik.template.compose_data.as_dict + # nets = frozenset(render_all()) + # data["networks"] = {net: NetArgsYaml(name=f"{net}_proxy") for net in nets} + # data["services"]["traefik"]["networks"] = nets + # data = cast(TypeYamlCompatibleDict, cast(object, data)) + # + # txt = traefik.write(to_yaml(data), render=True) + # renderers.write_bind_vol_data() + # traefik.bind_vols()