mantis-cli 22.0.3__tar.gz → 22.2.0__tar.gz

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis_cli
-Version: 22.0.3
+Version: 22.2.0
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský
@@ -69,12 +69,44 @@ You can use ``<MANTIS>`` variable in your paths if needed as a relative referenc
 | project_path             | string | path to folder with project files on remote server           |
 | connection               | string | single connection string (use instead of connections)        |
 | connections              | dict   | definition of your connections for each environment          |
+| tunnel                   | dict   | SSH tunnel settings                                          |
+| tunnel.enabled           | bool   | share a single SSH connection for the whole run (null = auto)|
+| tunnel.remote_socket     | string | path to the docker socket on the server                      |
+| tunnel.ssh_options       | array  | extra options passed to the ssh command                      |
 
 TODO:
 - default values
 
 See [template file](https://github.com/PragmaticMates/mantis-cli/blob/master/mantis/mantis.tpl) for exact JSON structure.
 
+### Build settings
+
+With `build.tool` set to `"docker"`, mantis builds each service that declares a `build:` section
+in your compose files, reading `context`, `dockerfile`, `args`, `platform`, `cache_from` and
+`cache_to` from it. Nothing else needs configuring — the compose file stays the single source of
+truth:
+
+```yaml
+services:
+  backend:
+    image: acme/app:production
+    build:
+      context: ../../../
+      dockerfile: ./configs/docker/production/backend/Dockerfile
+      cache_from:
+        - type=registry,ref=acme/app:production
+      cache_to:
+        - type=inline
+```
+
+`cache_from` and `cache_to` become `--cache-from` / `--cache-to` on `docker build`, which is how
+you keep a layer cache across machines that share no local docker state — CI runners, for
+instance. Inline cache stores the metadata in the image being pushed and reads it back from the
+previous one, so no separate cache tag is needed; note that it records only the final image's
+layers, which is enough whenever earlier build stages copy their output forward.
+
+With `build.tool` set to `"compose"`, `docker compose build` handles all of this itself.
+
 ### Connections
 
 Mantis supports two connection modes: **multi-environment** and **single connection**.
@@ -116,6 +148,70 @@ Environment files are looked up directly in the `environment.folder` instead of
 
 **Note:** You cannot define both `connection` and `connections` in the same config file.
 
+#### SSH tunnel
+
+With a plain `ssh://` connection, Docker opens a **separate SSH connection for every
+command** mantis runs. A single deployment issues dozens of them, and `compose pull` fans
+out over all services at once. That burst runs into sshd's `MaxStartups`, which drops
+connections beyond its threshold:
+
+```
+kex_exchange_identification: read: Connection reset by peer
+```
+
+It is also slow when the connection goes through a `ProxyCommand` (Cloudflare Access,
+bastion hosts, ...), because each connection spawns its own proxy process.
+
+The tunnel makes mantis open **one** SSH connection per run, forwarding the remote docker
+socket to a local one and pointing every docker command at it.
+
+Docker itself offers no way to pass `ssh` options (`ControlMaster` and friends), so this
+is handled entirely by mantis — no `~/.ssh/config` changes are needed, and connection
+details keep coming from your `ssh://` connection string. Unlike `ControlMaster`
+multiplexing, forwarded channels are not counted against sshd's `MaxSessions`, so no
+server-side configuration is required either.
+
+`tunnel.enabled` decides how much mantis verifies before trusting it:
+
+| value | behaviour |
+|-------|-----------|
+| unset (default) | detect per run: tunnel, and keep it only if the docker daemon answers through it |
+| `true` | tunnel without detecting, for a server already known to support it |
+| `false` | never tunnel |
+
+```json
+"tunnel": {
+    "enabled": true
+}
+```
+
+Detection costs one extra round-trip per run and cannot be skipped by opening the forward
+alone: `ssh -L` to a unix socket succeeds even when nothing listens on the far end, so a
+tunnel only proves itself once the daemon has replied. Set `enabled` explicitly once
+`check-tunnel` (below) confirms a server, and that round-trip goes away.
+
+Requirements on the server: the connecting user must be able to read the docker socket
+(typically membership in the `docker` group), and `AllowStreamLocalForwarding` must not
+be disabled — it defaults to `yes`. Whenever the tunnel cannot be used, mantis warns and
+falls back to a connection per docker command, so deployments keep working either way.
+
+The check ignores `tunnel.enabled`, so it answers "would this work" rather than "is this
+on" — use it before setting `enabled` to `true`:
+
+```bash
+mantis -e production check-tunnel
+```
+
+It opens the tunnel, asks the remote docker daemon for its version and closes it again,
+exiting non-zero on failure. A refused forward and an unreachable socket are reported
+separately, since they need different fixes (`sshd_config` versus group membership).
+
+Pass `--no-tunnel` to disable it for a single run:
+
+```bash
+mantis -e production --no-tunnel deploy
+```
+
 ### Encryption
 
 If you plan to use encryption and decryption of your environment files, you need to create encryption key.
@@ -295,6 +391,7 @@ Run `mantis --help` to see all available commands with their descriptions.
 | contexts                              | Prints all docker contexts                                |
 | create-context                        | Creates docker context                                    |
 | ssh                                   | Connects to remote host via SSH                           |
+| check-tunnel                          | Checks if the docker socket can be tunnelled over SSH     |
 
 **Django extension:**
 

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/README.md

@@ -47,12 +47,44 @@ You can use ``<MANTIS>`` variable in your paths if needed as a relative referenc
 | project_path             | string | path to folder with project files on remote server           |
 | connection               | string | single connection string (use instead of connections)        |
 | connections              | dict   | definition of your connections for each environment          |
+| tunnel                   | dict   | SSH tunnel settings                                          |
+| tunnel.enabled           | bool   | share a single SSH connection for the whole run (null = auto)|
+| tunnel.remote_socket     | string | path to the docker socket on the server                      |
+| tunnel.ssh_options       | array  | extra options passed to the ssh command                      |
 
 TODO:
 - default values
 
 See [template file](https://github.com/PragmaticMates/mantis-cli/blob/master/mantis/mantis.tpl) for exact JSON structure.
 
+### Build settings
+
+With `build.tool` set to `"docker"`, mantis builds each service that declares a `build:` section
+in your compose files, reading `context`, `dockerfile`, `args`, `platform`, `cache_from` and
+`cache_to` from it. Nothing else needs configuring — the compose file stays the single source of
+truth:
+
+```yaml
+services:
+  backend:
+    image: acme/app:production
+    build:
+      context: ../../../
+      dockerfile: ./configs/docker/production/backend/Dockerfile
+      cache_from:
+        - type=registry,ref=acme/app:production
+      cache_to:
+        - type=inline
+```
+
+`cache_from` and `cache_to` become `--cache-from` / `--cache-to` on `docker build`, which is how
+you keep a layer cache across machines that share no local docker state — CI runners, for
+instance. Inline cache stores the metadata in the image being pushed and reads it back from the
+previous one, so no separate cache tag is needed; note that it records only the final image's
+layers, which is enough whenever earlier build stages copy their output forward.
+
+With `build.tool` set to `"compose"`, `docker compose build` handles all of this itself.
+
 ### Connections
 
 Mantis supports two connection modes: **multi-environment** and **single connection**.
@@ -94,6 +126,70 @@ Environment files are looked up directly in the `environment.folder` instead of
 
 **Note:** You cannot define both `connection` and `connections` in the same config file.
 
+#### SSH tunnel
+
+With a plain `ssh://` connection, Docker opens a **separate SSH connection for every
+command** mantis runs. A single deployment issues dozens of them, and `compose pull` fans
+out over all services at once. That burst runs into sshd's `MaxStartups`, which drops
+connections beyond its threshold:
+
+```
+kex_exchange_identification: read: Connection reset by peer
+```
+
+It is also slow when the connection goes through a `ProxyCommand` (Cloudflare Access,
+bastion hosts, ...), because each connection spawns its own proxy process.
+
+The tunnel makes mantis open **one** SSH connection per run, forwarding the remote docker
+socket to a local one and pointing every docker command at it.
+
+Docker itself offers no way to pass `ssh` options (`ControlMaster` and friends), so this
+is handled entirely by mantis — no `~/.ssh/config` changes are needed, and connection
+details keep coming from your `ssh://` connection string. Unlike `ControlMaster`
+multiplexing, forwarded channels are not counted against sshd's `MaxSessions`, so no
+server-side configuration is required either.
+
+`tunnel.enabled` decides how much mantis verifies before trusting it:
+
+| value | behaviour |
+|-------|-----------|
+| unset (default) | detect per run: tunnel, and keep it only if the docker daemon answers through it |
+| `true` | tunnel without detecting, for a server already known to support it |
+| `false` | never tunnel |
+
+```json
+"tunnel": {
+    "enabled": true
+}
+```
+
+Detection costs one extra round-trip per run and cannot be skipped by opening the forward
+alone: `ssh -L` to a unix socket succeeds even when nothing listens on the far end, so a
+tunnel only proves itself once the daemon has replied. Set `enabled` explicitly once
+`check-tunnel` (below) confirms a server, and that round-trip goes away.
+
+Requirements on the server: the connecting user must be able to read the docker socket
+(typically membership in the `docker` group), and `AllowStreamLocalForwarding` must not
+be disabled — it defaults to `yes`. Whenever the tunnel cannot be used, mantis warns and
+falls back to a connection per docker command, so deployments keep working either way.
+
+The check ignores `tunnel.enabled`, so it answers "would this work" rather than "is this
+on" — use it before setting `enabled` to `true`:
+
+```bash
+mantis -e production check-tunnel
+```
+
+It opens the tunnel, asks the remote docker daemon for its version and closes it again,
+exiting non-zero on failure. A refused forward and an unreachable socket are reported
+separately, since they need different fixes (`sshd_config` versus group membership).
+
+Pass `--no-tunnel` to disable it for a single run:
+
+```bash
+mantis -e production --no-tunnel deploy
+```
+
 ### Encryption
 
 If you plan to use encryption and decryption of your environment files, you need to create encryption key.
@@ -273,6 +369,7 @@ Run `mantis --help` to see all available commands with their descriptions.
 | contexts                              | Prints all docker contexts                                |
 | create-context                        | Creates docker context                                    |
 | ssh                                   | Connects to remote host via SSH                           |
+| check-tunnel                          | Checks if the docker socket can be tunnelled over SSH     |
 
 **Django extension:**
 

mantis_cli-22.2.0/mantis/__init__.py

@@ -0,0 +1 @@
+VERSION = '22.2.0'

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/mantis/app.py

@@ -191,6 +191,7 @@ def main(
     environment: Optional[str] = typer.Option(None, "--env", "-e", help="Environment ID"),
     mode: str = typer.Option("remote", "--mode", "-m", help="Execution mode: remote, ssh, host"),
     dry_run: bool = typer.Option(False, "--dry-run", "-n", help="Show commands without executing"),
+    no_tunnel: bool = typer.Option(False, "--no-tunnel", help="Do not tunnel the remote docker socket over a single SSH connection"),
     version: bool = typer.Option(False, "--version", "-v", callback=version_callback, is_eager=True, help="Show version and exit"),
 ):
     """Mantis CLI - Docker deployment tool."""
@@ -216,4 +217,4 @@ def main(
 
     state._mode = mode
     state._dry_run = dry_run
-    state._manager = get_manager(environment, mode, dry_run=dry_run, commands=commands)
+    state._manager = get_manager(environment, mode, dry_run=dry_run, commands=commands, use_tunnel=not no_tunnel)

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/mantis/command_line.py

@@ -99,6 +99,7 @@ def parse_global_options(global_opts: List[str]) -> dict:
         'env': None,
         'mode': 'remote',
         'dry_run': False,
+        'use_tunnel': True,
     }
 
     i = 0
@@ -113,6 +114,9 @@ def parse_global_options(global_opts: List[str]) -> dict:
         elif opt in ('-n', '--dry-run'):
             result['dry_run'] = True
             i += 1
+        elif opt == '--no-tunnel':
+            result['use_tunnel'] = False
+            i += 1
         else:
             i += 1
 
@@ -185,7 +189,7 @@ def run():
     all_commands = [group[0] for group in cmd_groups if group]
     state._mode = opts['mode']
     state._dry_run = opts['dry_run']
-    state._manager = get_manager(opts['env'], opts['mode'], dry_run=opts['dry_run'], commands=all_commands)
+    state._manager = get_manager(opts['env'], opts['mode'], dry_run=opts['dry_run'], commands=all_commands, use_tunnel=opts['use_tunnel'])
 
     # Get Click app from Typer
     click_app = typer.main.get_command(app)

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/mantis/commands/connection.py

@@ -1,4 +1,6 @@
-"""Connection commands: contexts, create-context, ssh."""
+"""Connection commands: contexts, create-context, ssh, check-tunnel."""
+import typer
+
 from mantis.app import command, state
 
 
@@ -18,3 +20,10 @@ def create_context():
 def ssh_cmd():
     """Connects to remote host via SSH"""
     state.ssh()
+
+
+@command(name="check-tunnel", panel="Connections")
+def check_tunnel():
+    """Checks if the docker socket can be tunnelled over SSH"""
+    if not state.check_tunnel():
+        raise typer.Exit(code=1)

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/mantis/managers.py

@@ -1,8 +1,12 @@
 import asyncio
+import atexit
 import json
 import os
+import shutil
 import subprocess
 import sys
+import tempfile
+import threading
 import time
 import yaml
 from collections import defaultdict
@@ -27,11 +31,19 @@ class AbstractManager(object):
     """
     environment_id = None
 
-    def __init__(self, config_file: str = None, environment_id: str = None, mode: str = 'remote', dry_run: bool = False):
+    def __init__(self, config_file: str = None, environment_id: str = None, mode: str = 'remote', dry_run: bool = False, use_tunnel: bool = True):
         self.environment_id = environment_id
         self.mode = mode
         self.dry_run = dry_run
 
+        # SSH tunnel state (see ensure_tunnel)
+        self.use_tunnel = use_tunnel
+        self._tunnel_lock = threading.Lock()
+        self._tunnel_socket = None
+        self._tunnel_control_socket = None
+        self._tunnel_dir = None
+        self._tunnel_failed = False
+
         # config file
         self.config_file = config_file
 
@@ -118,6 +130,202 @@ class AbstractManager(object):
 
         return details
 
+    @property
+    def tunnel_config(self) -> Dict[str, Any]:
+        return self.config.get('tunnel', {})
+
+    def ensure_tunnel(self) -> Optional[str]:
+        """
+        Returns path of a local unix socket forwarded to the remote docker socket,
+        opening the SSH master connection on first use.
+
+        Returns None when tunnelling does not apply (disabled, non-ssh connection, ...) or
+        when it turns out to be unavailable. In both cases the caller falls back to a
+        plain ssh:// docker host.
+
+        An explicitly enabled tunnel is used straight away. An unset one is detected: the
+        forward succeeds even when nothing listens on the remote socket, so availability
+        is only known once the docker daemon has answered through it.
+        """
+        if self._tunnel_socket:
+            return self._tunnel_socket
+
+        with self._tunnel_lock:
+            # another thread may have opened it meanwhile
+            if self._tunnel_socket or self._tunnel_failed:
+                return self._tunnel_socket
+
+            enabled = self.tunnel_config.get('enabled')
+
+            if not self.use_tunnel or enabled is False:
+                return None
+
+            if self.mode != 'remote':
+                return None
+
+            if not self.connection or not self.connection.startswith('ssh://'):
+                return None
+
+            if not self.host or not self.user:
+                return None
+
+            # an explicitly enabled tunnel is trusted, an unset one is verified
+            detect = enabled is None and not self.dry_run
+
+            if detect:
+                CLI.info('Tunnel not configured, checking if it is available...')
+
+            # assigned before probing, so the docker call below does not re-enter here
+            self._tunnel_socket = self.start_tunnel()
+
+            if self._tunnel_socket and detect:
+                version = self.probe_tunnel()
+
+                if version:
+                    CLI.success(f'Tunnel is available (docker {version}). '
+                                f'Enable it in config to skip this check.')
+                else:
+                    CLI.warning(
+                        'Docker daemon did not answer through the SSH tunnel.\n'
+                        'Falling back to a separate SSH connection per docker command.'
+                    )
+                    self.stop_tunnel()
+
+            self._tunnel_failed = self._tunnel_socket is None
+
+            return self._tunnel_socket
+
+    def probe_tunnel(self) -> Optional[str]:
+        """
+        Returns the version of the docker daemon answering through the tunnel,
+        or None when nothing answers on the remote socket.
+        """
+        version = self.docker('version --format "{{.Server.Version}}"', return_output=True)
+        version = version.strip() if version else ''
+
+        return version or None
+
+    def start_tunnel(self) -> Optional[str]:
+        """
+        Opens a single backgrounded SSH master forwarding the remote docker socket.
+        Every docker command then reuses it instead of opening its own connection.
+        """
+        remote_socket = self.tunnel_config.get('remote_socket', '/var/run/docker.sock')
+        ssh_options = self.tunnel_config.get('ssh_options', [])
+
+        # unix socket paths are limited to ~104 characters, so prefer a shallow base
+        # directory over the default temp folder (macOS uses a deep /var/folders/... one)
+        base_dir = '/tmp' if Path('/tmp').is_dir() else None
+
+        self._tunnel_dir = tempfile.mkdtemp(prefix='mantis-', dir=base_dir)
+        local_socket = str(Path(self._tunnel_dir) / 'docker.sock')
+        control_socket = str(Path(self._tunnel_dir) / 'ssh.ctl')
+
+        command = [
+            'ssh', '-f', '-N', '-M',
+            '-S', control_socket,
+            '-o', 'ExitOnForwardFailure=yes',
+            '-o', 'ServerAliveInterval=30',
+            '-o', 'ServerAliveCountMax=3',
+            '-L', f'{local_socket}:{remote_socket}',
+            '-p', str(self.port or 22),
+            *ssh_options,
+            f'{self.user}@{self.host}',
+        ]
+
+        if self.dry_run:
+            CLI.warning(f'[DRY-RUN] {" ".join(command)}')
+            self.remove_tunnel_dir()
+            return local_socket
+
+        CLI.info(f'Opening SSH tunnel to {self.user}@{self.host}...')
+
+        # ssh -f keeps its inherited output open in the backgrounded process, so a pipe
+        # would never reach EOF and subprocess.run would block forever. Use a file.
+        output_file = Path(self._tunnel_dir) / 'ssh.log'
+
+        with open(output_file, 'w') as output:
+            result = subprocess.run(command, stdin=subprocess.DEVNULL, stdout=output, stderr=output)
+
+        if result.returncode != 0:
+            CLI.warning(
+                f'Failed to open SSH tunnel: {output_file.read_text().strip()}\n'
+                f'Falling back to a separate SSH connection per docker command.'
+            )
+            self.remove_tunnel_dir()
+            return None
+
+        self._tunnel_control_socket = control_socket
+        atexit.register(self.stop_tunnel)
+
+        return local_socket
+
+    def stop_tunnel(self) -> None:
+        """
+        Closes the SSH master connection and removes its temporary files. Idempotent.
+        """
+        if self._tunnel_control_socket:
+            subprocess.run(
+                ['ssh', '-S', self._tunnel_control_socket, '-O', 'exit', f'{self.user}@{self.host}'],
+                capture_output=True, text=True
+            )
+            self._tunnel_control_socket = None
+
+        self._tunnel_socket = None
+        self.remove_tunnel_dir()
+
+    def remove_tunnel_dir(self) -> None:
+        if self._tunnel_dir:
+            shutil.rmtree(self._tunnel_dir, ignore_errors=True)
+            self._tunnel_dir = None
+
+    def check_tunnel(self) -> bool:
+        """
+        Verifies the SSH tunnel can be used for this connection, regardless of whether it
+        is enabled in the config. Opens it, queries the remote docker daemon and closes it
+        again, telling apart a refused forward from a missing access to the docker socket.
+        """
+        if self.mode != 'remote':
+            CLI.error(f'Tunnel is only used in remote mode, not in "{self.mode}" mode.')
+
+        if not self.connection:
+            env_info = f' for environment {self.environment.id}' if self.environment.id else ''
+            CLI.error(f'Connection{env_info} not defined!')
+
+        if not self.connection.startswith('ssh://'):
+            CLI.error(f'Tunnel requires an ssh:// connection, but this one is "{self.connection}".')
+
+        remote_socket = self.tunnel_config.get('remote_socket', '/var/run/docker.sock')
+
+        if self.tunnel_config.get('enabled') is False:
+            CLI.warning('Tunnel is disabled in config, checking anyway...')
+
+        CLI.step(1, 2, f'Forwarding {self.user}@{self.host}:{remote_socket}')
+
+        # bypass ensure_tunnel, the point of the check is to ignore the config
+        self._tunnel_socket = self.start_tunnel()
+
+        if not self._tunnel_socket:
+            CLI.danger('Tunnel is NOT available.')
+            CLI.info(f'The server may not allow forwarding of unix sockets. '
+                     f'Check "AllowStreamLocalForwarding" in its sshd_config.')
+            return False
+
+        CLI.step(2, 2, 'Querying docker daemon through the tunnel')
+
+        version = self.probe_tunnel()
+
+        self.stop_tunnel()
+
+        if not version:
+            CLI.danger('Tunnel is NOT available.')
+            CLI.info(f'The forward works, but the docker daemon did not answer on {remote_socket}. '
+                     f'Make sure user "{self.user}" can access it (usually by being in the "docker" group).')
+            return False
+
+        CLI.success(f'Tunnel is available (docker {version}).')
+        return True
+
     @property
     def docker_connection(self) -> str:
         # In single connection mode or when env.id contains 'local', no extra connection needed
@@ -129,6 +337,11 @@ class AbstractManager(object):
                 env_info = f' for environment {self.environment.id}' if self.environment.id else ''
                 CLI.error(f'Connection{env_info} not defined!')
             if self.connection.startswith('ssh://'):
+                tunnel_socket = self.ensure_tunnel()
+
+                if tunnel_socket:
+                    return f'DOCKER_HOST="unix://{tunnel_socket}"'
+
                 return f'DOCKER_HOST="{self.connection}"'
             elif self.connection.startswith('context://'):
                 context_name = self.connection.replace('context://', '')
@@ -823,6 +1036,7 @@ class BaseManager(AbstractManager):
             for service, info in self.services_to_build().items():
                 platform = f"--platform={info['platform']}" if info['platform'] != '' else ''
                 cache_from = ' '.join([f"--cache-from {cache}" for cache in info['cache_from']]) if info['cache_from'] != [] else ''
+                cache_to = ' '.join([f"--cache-to {cache}" for cache in info['cache_to']]) if info['cache_to'] != [] else ''
                 args = ' '.join([f"--build-arg {key}={value}" for key, value in info['args'].items()]) if info['args'] != {} else ''
                 image = info['image'] if info['image'] != '' else f"{info['project_name']}-{service}".lstrip('-')
 
@@ -831,7 +1045,7 @@ class BaseManager(AbstractManager):
                 dockerfile = str(Path(context) / info['dockerfile'])
 
                 self.docker(
-                    f"build {context} {build_args} {args} {platform} {cache_from} -t {image} -f {dockerfile} {params}",
+                    f"build {context} {build_args} {args} {platform} {cache_from} {cache_to} -t {image} -f {dockerfile} {params}",
                     use_connection=False)
         else:
             CLI.error(f'Unknown build tool: {build_tool}. Available tools: {", ".join(available_tools)}')
@@ -899,6 +1113,7 @@ class BaseManager(AbstractManager):
                         'dockerfile': build.get('dockerfile', 'Dockerfile'),
                         'context': build.get('context', '.'),
                         'cache_from': build.get('cache_from', []),
+                        'cache_to': build.get('cache_to', []),
                         'args': build.get('args', {}),
                         'image': service_config.get('image', ''),
                         'platform': service_config.get('platform', '')
@@ -1666,6 +1881,11 @@ def get_extension_classes(extensions: List[str]) -> List[type]:
 
 SECRETS_COMMANDS = {'show-env', 'encrypt-env', 'decrypt-env', 'check-env'}
 
+# Commands running against the local docker daemon, so they need no connection
+# (see use_connection=False in build and push). They accept any environment which is
+# either defined as a connection or has an environment folder.
+LOCAL_COMMANDS = {'build', 'b', 'push', 'p'}
+
 
 def validate_environment_for_commands(environment_id: str, config: Dict[str, Any], config_file: str, commands: list) -> None:
     """
@@ -1695,6 +1915,12 @@ def validate_environment_for_commands(environment_id: str, config: Dict[str, Any
             if environment_id not in folder_envs:
                 CLI.error(f'Environment "{environment_id}" not available for command "{cmd}". '
                          f'Available environments (folders): {", ".join(sorted(folder_envs)) if folder_envs else "none"}')
+        elif cmd in LOCAL_COMMANDS:
+            # Local command needs no connection, a folder-based environment is enough
+            if 'local' not in environment_id and environment_id not in connection_envs and environment_id not in folder_envs:
+                available = ['local'] + connection_envs + folder_envs
+                CLI.error(f'Environment "{environment_id}" not available for command "{cmd}". '
+                         f'Available environments: {", ".join(sorted(set(available)))}')
         else:
             # Other commands need connection or 'local'
             if 'local' not in environment_id and environment_id not in connection_envs:
@@ -1727,6 +1953,7 @@ def resolve_environment(environment_id: Optional[str], config: Dict[str, Any], c
         folder_envs = [d.name for d in env_path.iterdir() if d.is_dir()]
 
     # For secrets commands: use folder-based environments only
+    # For local commands: use connections + folders + local
     # For other commands: use connections + local
     if command in SECRETS_COMMANDS:
         available_envs = folder_envs
@@ -1735,8 +1962,13 @@ def resolve_environment(environment_id: Optional[str], config: Dict[str, Any], c
         if 'local' in environment_id:
             return environment_id
 
-        connections = config.get('connections', {})
-        available_envs = ['local'] + list(connections.keys())
+        connection_envs = list(config.get('connections', {}).keys())
+
+        if command in LOCAL_COMMANDS:
+            # no connection needed, a folder-based environment is enough
+            available_envs = list(dict.fromkeys(['local'] + connection_envs + folder_envs))
+        else:
+            available_envs = ['local'] + connection_envs
 
     # Check for exact match first
     if environment_id in available_envs:
@@ -1754,7 +1986,7 @@ def resolve_environment(environment_id: Optional[str], config: Dict[str, Any], c
         CLI.error(f'Environment "{environment_id}" not found. Available: {", ".join(sorted(available_envs))}')
 
 
-def get_manager(environment_id: Optional[str], mode: str, dry_run: bool = False, commands: list = None) -> BaseManager:
+def get_manager(environment_id: Optional[str], mode: str, dry_run: bool = False, commands: list = None, use_tunnel: bool = True) -> BaseManager:
     # config file
     config_file = find_config(environment_id, commands=commands)
     config = load_config(config_file)
@@ -1783,7 +2015,7 @@ def get_manager(environment_id: Optional[str], mode: str, dry_run: bool = False,
     class MantisManager(*[manager_class] + extension_classes):
         pass
 
-    manager = MantisManager(config_file=config_file, environment_id=environment_id, mode=mode, dry_run=dry_run)
+    manager = MantisManager(config_file=config_file, environment_id=environment_id, mode=mode, dry_run=dry_run, use_tunnel=use_tunnel)
 
     # set extensions data
     for extension, extension_params in extensions.items():

{mantis_cli-22.0.3 → mantis_cli-22.2.0}/mantis/mantis.tpl

@@ -33,5 +33,10 @@
   "project_path": "~",
   "connection": null,
   "connections": {
+  },
+  "tunnel": {
+    "enabled": null,
+    "remote_socket": "/var/run/docker.sock",
+    "ssh_options": []
   }
 }