Merge pull request #223 Exegol v4.3.5

Release 4.3.5

.github/workflows/sub_testing.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           python-version: "3.12"
       - name: Install requirements
-        run: python -m pip install --user mypy types-requests types-PyYAML
+        run: python -m pip install --user mypy types-requests types-PyYAML types-tzlocal
       - name: Run code analysis (package)
         run: mypy ./exegol/ --ignore-missing-imports --check-untyped-defs --pretty # TODO add --disallow-untyped-defs
       - name: Run code analysis (source)
@@ -42,6 +42,6 @@ jobs:
         with:
           python-version: "3.12"
       - name: Install requirements
-        run: python -m pip install --user mypy types-requests types-PyYAML
+        run: python -m pip install --user mypy types-requests types-PyYAML types-tzlocal
       - name: Check python compatibility for ${{ matrix.os }}/${{ matrix.version }}
         run: mypy ./exegol.py --ignore-missing-imports --check-untyped-defs --python-version ${{ matrix.version }} --platform ${{ matrix.os }}

exegol/config/ConstantConfig.py

@@ -5,7 +5,7 @@
 class ConstantConfig:
     """Constant parameters information"""
     # Exegol Version
-    version: str = "4.3.4"
+    version: str = "4.3.5"
 
     # Exegol documentation link
     documentation: str = "https://exegol.rtfd.io/"

exegol/console/TUI.py

@@ -7,6 +7,7 @@
 from rich.prompt import Prompt
 from rich.table import Table
 
+from exegol.config.EnvInfo import EnvInfo
 from exegol.console import ConsoleFormat
 from exegol.console.ConsoleFormat import boolFormatter, getColor, richLen
 from exegol.console.ExegolProgress import ExegolProgress
@@ -17,7 +18,6 @@
 from exegol.model.ExegolContainerTemplate import ExegolContainerTemplate
 from exegol.model.ExegolImage import ExegolImage
 from exegol.model.SelectableInterface import SelectableInterface
-from exegol.config.EnvInfo import EnvInfo
 from exegol.utils.ExeLog import logger, console, ExeLog
 
 
@@ -437,7 +437,10 @@ def __buildContainerRecapTable(container: ExegolContainerTemplate):
         recap.title = "[not italic]:white_medium_star: [/not italic][gold3][g]Container summary[/g][/gold3]"
         # Header
         recap.add_column(f"[bold blue]Name[/bold blue]{os.linesep}[bold blue]Image[/bold blue]", justify="right")
-        container_info_header = f"{container.getDisplayName()}{os.linesep}{container.image.getName()}"
+        container_status = container.getTextStatus()
+
+        container_info_header = (f"{container.getDisplayName()} {'(' + container_status + ')' if container_status else ''}{os.linesep}"
+                                 f"{container.image.getName()}")
         if "N/A" not in container.image.getImageVersion():
             container_info_header += f" - v.{container.image.getImageVersion()}"
         if "Unknown" not in container.image.getStatus():

exegol/console/cli/actions/ExegolParameters.py

@@ -289,4 +289,4 @@ class Version(Command):
     """Print current Exegol version"""
 
     def __call__(self, *args, **kwargs):
-        return ExegolManager.print_version
+        return lambda: None

exegol/manager/ExegolController.py

@@ -1,3 +1,5 @@
+import logging
+
 try:
     import docker
     import requests
@@ -69,8 +71,16 @@ def main():
         logger.info("Exiting")
     except git.exc.GitCommandError as git_error:
         print_exception_banner()
+        # Printing git stderr as raw to avoid any Rich parsing error
+        logger.debug("Full git output:")
+        logger.raw(git_error, level=logging.DEBUG)
+        logger.empty_line()
         error = git_error.stderr.strip().split(": ")[-1].strip("'")
-        logger.critical(f"A critical error occurred while running this git command: {' '.join(git_error.command)} => {error}")
+        logger.error("Git error received:")
+        # Printing git error as raw to avoid any Rich parsing error
+        logger.raw(error, level=logging.ERROR)
+        logger.empty_line()
+        logger.critical(f"A critical error occurred while running this git command: {' '.join(git_error.command)}")
     except Exception:
         print_exception_banner()
         console.print_exception(show_locals=True, suppress=[docker, requests, git])

exegol/manager/ExegolManager.py

@@ -362,7 +362,13 @@ def __loadOrCreateContainer(cls,
             # Return cache
             return cls.__container
         container_tag: Optional[str] = override_container if override_container is not None else ParametersManager().containertag
-        container_tags: Optional[Sequence[str]] = ParametersManager().multicontainertag
+        container_tags: Optional[List[str]] = None
+        if ParametersManager().multicontainertag:
+            container_tags = []
+            for tag in ParametersManager().multicontainertag:
+                # Prevent duplicate tag selection
+                if tag not in container_tags:
+                    container_tags.append(tag)
         try:
             if container_tag is None and (container_tags is None or len(container_tags) == 0):
                 # Interactive container selection
@@ -438,51 +444,55 @@ def __interactiveSelection(cls,
     @classmethod
     def __prepareContainerConfig(cls):
         """Create Exegol configuration with user input"""
-        # Create default exegol config
-        config = ContainerConfig()
-        # Container configuration from user CLI options
-        if ParametersManager().X11:
-            config.enableGUI()
-        if ParametersManager().share_timezone:
-            config.enableSharedTimezone()
-        config.setNetworkMode(ParametersManager().host_network)
-        if ParametersManager().ports is not None:
-            for port in ParametersManager().ports:
-                config.addRawPort(port)
-        if ParametersManager().my_resources:
-            config.enableMyResources()
-        if ParametersManager().exegol_resources:
-            config.enableExegolResources()
-        if ParametersManager().log:
-            config.enableShellLogging(ParametersManager().log_method,
-                                      UserConfig().shell_logging_compress ^ ParametersManager().log_compress)
-        if ParametersManager().workspace_path:
-            if ParametersManager().mount_current_dir:
-                logger.warning(f'Workspace conflict detected (-cwd cannot be use with -w). Using: {ParametersManager().workspace_path}')
-            config.setWorkspaceShare(ParametersManager().workspace_path)
-        elif ParametersManager().mount_current_dir:
-            config.enableCwdShare()
-        if ParametersManager().privileged:
-            config.setPrivileged()
-        elif ParametersManager().capabilities is not None:
-            for cap in ParametersManager().capabilities:
-                config.addCapability(cap)
-        if ParametersManager().volumes is not None:
-            for volume in ParametersManager().volumes:
-                config.addRawVolume(volume)
-        if ParametersManager().devices is not None:
-            for device in ParametersManager().devices:
-                config.addUserDevice(device)
-        if ParametersManager().vpn is not None:
-            config.enableVPN()
-        if ParametersManager().envs is not None:
-            for env in ParametersManager().envs:
-                config.addRawEnv(env)
-        if UserConfig().desktop_default_enable ^ ParametersManager().desktop:
-            config.enableDesktop(ParametersManager().desktop_config)
-        if ParametersManager().comment:
-            config.addComment(ParametersManager().comment)
-        return config
+        try:
+            # Create default exegol config
+            config = ContainerConfig()
+            # Container configuration from user CLI options
+            if ParametersManager().X11:
+                config.enableGUI()
+            if ParametersManager().share_timezone:
+                config.enableSharedTimezone()
+            config.setNetworkMode(ParametersManager().host_network)
+            if ParametersManager().ports is not None:
+                for port in ParametersManager().ports:
+                    config.addRawPort(port)
+            if ParametersManager().my_resources:
+                config.enableMyResources()
+            if ParametersManager().exegol_resources:
+                config.enableExegolResources()
+            if ParametersManager().log:
+                config.enableShellLogging(ParametersManager().log_method,
+                                          UserConfig().shell_logging_compress ^ ParametersManager().log_compress)
+            if ParametersManager().workspace_path:
+                if ParametersManager().mount_current_dir:
+                    logger.warning(f'Workspace conflict detected (-cwd cannot be use with -w). Using: {ParametersManager().workspace_path}')
+                config.setWorkspaceShare(ParametersManager().workspace_path)
+            elif ParametersManager().mount_current_dir:
+                config.enableCwdShare()
+            if ParametersManager().privileged:
+                config.setPrivileged()
+            elif ParametersManager().capabilities is not None:
+                for cap in ParametersManager().capabilities:
+                    config.addCapability(cap)
+            if ParametersManager().volumes is not None:
+                for volume in ParametersManager().volumes:
+                    config.addRawVolume(volume)
+            if ParametersManager().devices is not None:
+                for device in ParametersManager().devices:
+                    config.addUserDevice(device)
+            if ParametersManager().vpn is not None:
+                config.enableVPN()
+            if ParametersManager().envs is not None:
+                for env in ParametersManager().envs:
+                    config.addRawEnv(env)
+            if UserConfig().desktop_default_enable ^ ParametersManager().desktop:
+                config.enableDesktop(ParametersManager().desktop_config)
+            if ParametersManager().comment:
+                config.addComment(ParametersManager().comment)
+            return config
+        except CancelOperation as e:
+            logger.critical(f"Unable to create a new container: {e}")
+            raise e
 
     @classmethod
     def __createContainer(cls, name: Optional[str]) -> ExegolContainer: