seto 3.2.0__tar.gz → 3.4.0__tar.gz

{seto-3.2.0 → seto-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seto
-Version: 3.2.0
+Version: 3.4.0
 Summary: A Docker Swarm Deployment Manager
 License: Apache 2.0
 Keywords: docker,swarm,manager

{seto-3.2.0 → seto-3.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "seto"
-version = "3.2.0"
+version = "3.4.0"
 description = "A Docker Swarm Deployment Manager"
 keywords = ["docker", "swarm", "manager"]
 authors = ["Sébastien Demanou <demsking@gmail.com>"]
@@ -33,6 +33,7 @@ pyyaml = "^6.0.1"
 docker = "^7.1.0"
 
 [tool.poetry.group.dev.dependencies]
+classify-imports = "^4.2.0"
 
 [tool.pytest.ini_options]
 # Function starting with the following pattern are considered for test cases.

{seto-3.2.0 → seto-3.4.0}/seto/__main__.py

@@ -194,6 +194,9 @@ def main() -> None:
     'deploy', description='Deploy a new stack or update an existing stack'
   )
   deploy_parser.set_defaults(func=execute_deploy_command)
+  deploy_parser.add_argument(
+    '--image-prefix', default='', help='Image namespace prefix to added to internal images'
+  )
 
   #
   # Down command

{seto-3.2.0 → seto-3.4.0}/seto/commands/config.py

@@ -51,8 +51,8 @@ def resolve(
   }
 
   def parse(resolved_compose_data: dict, volumes: list[Volume]):
-    placement_hostname = resolved_compose_data.get('x-placement-hostname', None)
-    placement = resolved_compose_data.get('x-placement', None)
+    placement_hostname: str | None = resolved_compose_data.get('x-placement-hostname', None)
+    placement: str | None = resolved_compose_data.get('x-placement', None)
     networks_ = resolved_compose_data.get('networks', {})
     services = resolved_compose_data.get('services', {})
     volumes = resolved_compose_data.get('volumes', {})
@@ -72,10 +72,11 @@ def resolve(
       raise ValueError('Missing required x-placement or x-placement-hostname field')
 
     if execute:
-      execute(resolved_compose_data, placement_hostname or placement)
+      execute(resolved_compose_data, placement_hostname or placement or '')
 
   parse_services(
     driver=driver,
+    image_prefix=args.image_prefix,
     stack=args.stack or args.project,
     execute=parse,
     inject=inject,

{seto-3.2.0 → seto-3.4.0}/seto/commands/deploy.py

@@ -110,7 +110,9 @@ def parse_compose_config(
       published_port = random.randint(53100, 64200)
 
       if not service_traefik_port:
-        print(f'WARN: Service "{service_name}" has no defined port. Skipped from Traefik HTTP Provider')
+        print(
+          f'WARN: Service "{service_name}" has no defined port. Skipped from Traefik HTTP Provider'
+        )
         continue
 
       service_ports.append(f'{published_port}:{service_traefik_port}')
@@ -184,6 +186,7 @@ def deploy_seto_stack(args, driver: Driver, replica: list[Setting]) -> None:
   # Resolving compose local volumes
   resolved_compose_data, volumes = resolve_compose_file(
     driver=driver,
+    image_prefix=args.image_prefix,
     compose_data=internal_stack,
     inject=True,
   )
@@ -239,30 +242,31 @@ def execute_deploy_command(args, driver: Driver) -> None:
     },
   }
 
-  register_command = ' && '.join([
-    f'echo "Registering service {driver.stack_id}..."',
-    f'curl -s -X POST http://{HTTP_PROVIDER_SERVICENAME}:6116/api/config/{driver.stack_id} -H "Content-Type: application/json" -d @{traefik_http_provider_target} > /dev/nul',
-  ])
-
-  entrypoint = ' && '.join([
-    # Log the start of the initial endpoint call
-    'echo "Starting initial call to the provider endpoint..."',
-
-    # Call the POST endpoint at startup
-    register_command,
-
-    # Log the end of the initial endpoint call
-    'echo "Initial call to the provider endpoint completed. Running cron job..."',
-
-    # Set up the cron job
-    f'echo "*/1 * * * * {register_command}" | crontab -',
+  register_command = ' && '.join(
+    [
+      f'echo "Registering service {driver.stack_id}..."',
+      f'curl -s -X POST http://{HTTP_PROVIDER_SERVICENAME}:6116/api/config/{driver.stack_id} -H "Content-Type: application/json" -d @{traefik_http_provider_target} > /dev/nul',
+    ]
+  )
 
-    # Start the cron service
-    'crond -f',
-  ])
+  entrypoint = ' && '.join(
+    [
+      # Log the start of the initial endpoint call
+      'echo "Starting initial call to the provider endpoint..."',
+      # Call the POST endpoint at startup
+      register_command,
+      # Log the end of the initial endpoint call
+      'echo "Initial call to the provider endpoint completed. Running cron job..."',
+      # Set up the cron job
+      f'echo "*/1 * * * * {register_command}" | crontab -',
+      # Start the cron service
+      'crond -f',
+    ]
+  )
 
   seto_agent_compose_data, _ = resolve_compose_file(
     driver=driver,
+    image_prefix=args.image_prefix,
     compose_data={
       'services': {
         'seto_agent': {

{seto-3.2.0 → seto-3.4.0}/seto/core/command.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Sébastien Demanou. All Rights Reserved.
+# Copyright 2024-2025 Sébastien Demanou. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ def parse_volumes_args(args, driver: Driver) -> list[Volume]:
     driver=driver,
     stack=args.stack or args.project,
     execute=lambda resolved_compose_data, volumes: all_volumes.extend(volumes),
+    image_prefix=args.image_prefix,
   )
 
   return all_volumes

{seto-3.2.0 → seto-3.4.0}/seto/core/parser.py

@@ -18,6 +18,7 @@ import re
 import subprocess
 import sys
 from collections.abc import Callable
+from pathlib import Path
 from typing import Any
 from typing import Literal
 from typing import TypedDict
@@ -56,10 +57,7 @@ def parse_volume_entry(entry: str, default_mode='rw') -> tuple[str, str, str]:
 
 
 def parse_local_volumes(
-  stack: str,
-  *,
-  service_name: str,
-  service: Service,
+  stack: str, *, service_name: str, service: Service, image_prefix: str
 ) -> None:
   local_volumes = []
 
@@ -89,7 +87,7 @@ def parse_local_volumes(
     service_dockerfile = '\n'.join(service_dockerfile_definition)
     service_dockerfile = resolve_env_vars(service_dockerfile)
 
-    service['image'] = f'demsking/{image_name}:{image_version}'
+    service['image'] = f'{image_prefix}{image_name}:{image_version}'
     service['build'] = {
       'context': '.',
       'dockerfile': service_dockerfile_file,
@@ -162,6 +160,7 @@ def resolve_compose_file(
   compose_data: dict,
   inject: bool = False,
   mode: list[ResolveMode] | None = None,
+  image_prefix: str,
 ) -> tuple[dict, list]:
   mode_value = mode or ['swarm']
   updated_compose_data = compose_data.copy()
@@ -185,7 +184,9 @@ def resolve_compose_file(
 
     service_deploy_labels.update(service_labels)
     parse_stack_values(service_deploy_labels)
-    parse_local_volumes(driver.stack_id, service_name=service_name, service=service)
+    parse_local_volumes(
+      driver.stack_id, service_name=service_name, service=service, image_prefix=image_prefix
+    )
 
     parse_volumes(
       driver=driver,
@@ -242,7 +243,7 @@ def parse_service_configs(
           config_name = re.sub(
             r'_{2,}',
             '_',
-            f"{service_name}_{source.replace('/', '_').replace('.', '_')}".replace('-', '_'),
+            f'{service_name}_{source.replace("/", "_").replace(".", "_")}'.replace('-', '_'),
           )
 
           if inject:
@@ -272,6 +273,19 @@ def parse_service_configs(
     service['volumes'] = new_volumes
 
 
+def load_env_file(env_file_path: str) -> None:
+  """Load environment variables from a .env file into os.environ."""
+  if os.path.exists(env_file_path):
+    with open(env_file_path, encoding='utf-8') as file:
+      for line in file:
+        line = line.strip()
+        if line and not line.startswith('#') and '=' in line:
+          key, value = line.split('=', 1)
+          # Remove quotes if present
+          value = value.strip('"\'')
+          os.environ[key.strip()] = value
+
+
 def resolve_env_vars(content: str) -> str:
   output = subprocess.run(
     ['envsubst'],
@@ -280,21 +294,24 @@ def resolve_env_vars(content: str) -> str:
     capture_output=True,
     check=True,
   )
-
   return output.stdout
 
 
 def parse_compose_file(compose_file: str, resolve_vars=False) -> tuple[dict, str]:
   compose_file = os.path.realpath(compose_file)
 
+  # Auto-load corresponding .env file if it exists
+  compose_path = Path(compose_file)
+  env_file_path = compose_path.parent / f'{compose_path.stem}.env'
+  load_env_file(str(env_file_path))
+
   with open(compose_file, encoding='utf-8') as file:
     compose_content = file.read()
 
-    if resolve_vars:
-      compose_content = resolve_env_vars(compose_content)
-
-    compose_data = yaml.safe_load(compose_content)
+  if resolve_vars:
+    compose_content = resolve_env_vars(compose_content)
 
+  compose_data = yaml.safe_load(compose_content)
   return compose_data, compose_file  # type: ignore
 
 
@@ -305,6 +322,7 @@ def parse_services(
   execute: Callable[[dict, list], None] | None = None,
   mode: list[ResolveMode] | None = None,
   inject: bool = False,
+  image_prefix: str,
 ) -> tuple[list, list]:
   services_files = glob.glob(os.path.join(stack, '*.yaml'))
   output_resolved_compose_data = []
@@ -332,6 +350,7 @@ def parse_services(
       compose_data=compose_data,
       inject=inject,
       mode=[x_mode],
+      image_prefix=image_prefix,
     )
 
     output_resolved_compose_data.append(resolved_compose_data)