whentimeslows/home-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusting folder to compose-services so we don't get confused with the argo folder

Browse Source
This commit is contained in:
Scott Sorell
2026-10-03 14:38:14 -06:00
parent 461b0889e6
commit 191e41bbe9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composectl.py
+3 -3
View File
@@ -58,7 +58,7 @@ def build_compose_command(
def discover_compose_files(root: Path) -> list[Path]: def discover_compose_files(root: Path) -> list[Path]:
"""Return compose files under the services directory.""" """Return compose files under the services directory."""
services_dir = root / "compose-services" services_dir = root / "services"
if not services_dir.exists(): if not services_dir.exists():
return [] return []
@@ -67,7 +67,7 @@ def discover_compose_files(root: Path) -> list[Path]:
def discover_stack_names(root: Path) -> list[str]: def discover_stack_names(root: Path) -> list[str]:
"""Infer stack names from the services directory layout.""" """Infer stack names from the services directory layout."""
services_dir = root / "compose-services" services_dir = root / "services"
if not services_dir.exists(): if not services_dir.exists():
return [] return []
@@ -135,7 +135,7 @@ def main() -> int:
failure_count = 0 failure_count = 0
for stack_name in stack_names: for stack_name in stack_names:
compose_file = args.compose_file or Path(f"compose-services/{stack_name}/compose.yaml") compose_file = args.compose_file or Path(f"services/{stack_name}/compose.yaml")
project_name = args.project_name or f"{stack_name}_services" project_name = args.project_name or f"{stack_name}_services"
if args.action == "refresh": if args.action == "refresh":
tests/test_composectl.py
+10 -10
View File
@@ -26,7 +26,7 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_compose_command_uses_selected_runtime(self): def test_build_compose_command_uses_selected_runtime(self):
cmd = build_compose_command( cmd = build_compose_command(
runtime="podman", runtime="podman",
compose_file=Path("compose-services/media_rhel1/compose.yaml"), compose_file=Path("services/media_rhel1/compose.yaml"),
project_name="media_rhel1_services", project_name="media_rhel1_services",
action="up", action="up",
) )
@@ -36,7 +36,7 @@ class ComposeCtlTests(unittest.TestCase):
"podman", "podman",
"compose", "compose",
"-f", "-f",
"compose-services/media_rhel1/compose.yaml", "services/media_rhel1/compose.yaml",
"-p", "-p",
"media_rhel1_services", "media_rhel1_services",
"up", "up",
@@ -47,8 +47,8 @@ class ComposeCtlTests(unittest.TestCase):
def test_discover_compose_files_finds_existing_stacks(self): def test_discover_compose_files_finds_existing_stacks(self):
stack_files = discover_compose_files(Path(".")) stack_files = discover_compose_files(Path("."))
self.assertIn(Path("compose-services/media_nas1/compose.yaml"), stack_files) self.assertIn(Path("services/media_nas1/compose.yaml"), stack_files)
self.assertIn(Path("compose-services/media_rhel1/compose.yaml"), stack_files) self.assertIn(Path("services/media_rhel1/compose.yaml"), stack_files)
def test_discover_stack_names_returns_inferred_stack_names(self): def test_discover_stack_names_returns_inferred_stack_names(self):
stack_names = discover_stack_names(Path(".")) stack_names = discover_stack_names(Path("."))
@@ -58,22 +58,22 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_update_commands_returns_full_stack_refresh_sequence(self): def test_build_update_commands_returns_full_stack_refresh_sequence(self):
commands = build_update_commands( commands = build_update_commands(
runtime="podman", runtime="podman",
compose_file=Path("compose-services/media_rhel1/compose.yaml"), compose_file=Path("services/media_rhel1/compose.yaml"),
project_name="media_rhel1_services", project_name="media_rhel1_services",
) )
self.assertEqual( self.assertEqual(
commands, commands,
[ [
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"], ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"],
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"], ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"],
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"], ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"],
], ],
) )
def test_build_update_commands_can_include_image_prune(self): def test_build_update_commands_can_include_image_prune(self):
commands = build_update_commands( commands = build_update_commands(
runtime="docker", runtime="docker",
compose_file=Path("compose-services/media_nas1/compose.yaml"), compose_file=Path("services/media_nas1/compose.yaml"),
project_name="media_nas1_services", project_name="media_nas1_services",
prune=True, prune=True,
) )
@@ -82,7 +82,7 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_compose_command_can_validate_configuration(self): def test_build_compose_command_can_validate_configuration(self):
command = build_compose_command( command = build_compose_command(
runtime="docker", runtime="docker",
compose_file=Path("compose-services/media_nas1/compose.yaml"), compose_file=Path("services/media_nas1/compose.yaml"),
project_name="media_nas1_services", project_name="media_nas1_services",
action="config", action="config",
) )