docker-stack 2.2.4__py3-none-any.whl → 2.2.5__py3-none-any.whl

docker_stack/cli.py

@@ -37,7 +37,6 @@ from docker_stack.shell_auth import (
     shell_session_active,
 )
 from docker_stack.manager_api import (
-    FEATURE_CLUSTER_CONTAINER_CLI,
     FEATURE_STACK_DEPLOY,
     FEATURE_STACK_QUERY,
     ManagerApiClient,
@@ -102,15 +101,23 @@ def _write_selected_node(value: Optional[str], display_name: str) -> None:
         Path(node_state).write_text(f"{display_name}\n", encoding="utf-8")
 
 
-def _manager_with_cluster_cli() -> ManagerApiClient:
-    client = discover_manager_client()
-    if client is None or not client.supports(FEATURE_CLUSTER_CONTAINER_CLI):
-        raise RuntimeError("Docker-Manager does not support cluster container CLI; upgrade the manager and all node agents")
+def _require_manager() -> ManagerApiClient:
+    """Return a client for the Docker-Manager behind this shell, or explain why not.
+
+    Only the current manager is supported, so there is no capability negotiation here -
+    either the target is a Docker-Manager or it is a plain Docker daemon.
+    """
+    client = discover_manager_client(strict=True)
+    if client is None or not client.is_manager_backend():
+        raise RuntimeError(
+            f"{client.manager_url if client else 'the current Docker endpoint'} is not a "
+            "Docker-Manager; node-local commands need one"
+        )
     return client
 
 
 def _select_node(value: str) -> str:
-    client = _manager_with_cluster_cli()
+    client = _require_manager()
     requested = value.strip()
     if requested.lower() == "cluster":
         _write_selected_node(None, "cluster")
@@ -133,6 +140,9 @@ def _select_node(value: str) -> str:
         raise RuntimeError(f"node '{requested}' is not ready")
     node_id = str(node.get("id") or "").strip()
     hostname = str(node.get("hostname") or node_id).strip()
+    # Only this node has to be usable. The health of every other node - drained, down, or
+    # missing its agent - is none of this command's business.
+    client.check_node_agent(node_id or hostname)
     _write_selected_node(node_id, hostname)
     return hostname
 
@@ -339,6 +349,13 @@ def _print_cluster_containers(payload: Dict[str, object], *, no_trunc: bool = Fa
         columns.append("SIZE")
     columns.append("NODE")
     _print_table(columns, rows)
+    skipped = payload.get("skipped_nodes") if isinstance(payload.get("skipped_nodes"), list) else []
+    for node in skipped:
+        if isinstance(node, dict):
+            print(
+                f"docker ps: skipped node {node.get('node_name') or node.get('node_id')}: {node.get('reason')}",
+                file=sys.stderr,
+            )
     errors = payload.get("node_errors") if isinstance(payload.get("node_errors"), list) else []
     for error in errors:
         if isinstance(error, dict):
@@ -413,7 +430,7 @@ def _managed_docker(arguments: List[str]) -> int:
         return _exec_docker(values)
     try:
         client = discover_manager_client()
-        if client is None or not client.supports(FEATURE_CLUSTER_CONTAINER_CLI):
+        if client is None or not client.is_manager_backend():
             return _exec_docker(values)
         filters = []
         all_containers = False

docker_stack/manager_api.py

@@ -416,6 +416,22 @@ class ManagerApiClient:
         endpoint_id = self._resolve_endpoint_id()
         return f"/api/endpoints/{endpoint_id}{normalized}"
 
+    def is_manager_backend(self) -> bool:
+        """True when the target is a Docker-Manager stack API rather than a raw daemon."""
+        return self._detect_manager_backend()
+
+    def check_node_agent(self, selector: str) -> Dict[str, Any]:
+        """Report whether one node can serve node-local Docker commands.
+
+        Scoped to ``selector`` on purpose: an unrelated node that is drained, down, or
+        missing its agent must never make a usable node look unusable.
+        """
+        node = urllib.parse.quote(selector, safe="")
+        payload = self._request_json(f"/api/docker-stack/nodes/{node}/agent")
+        if not isinstance(payload, dict):
+            raise RuntimeError("Docker-Manager node agent response is invalid")
+        return payload
+
     def supports(self, feature_name: str) -> bool:
         features = self.detect_features()
         if FEATURE_MESUDIP_DOCKER_ENTERPRISE in features and feature_name in {
@@ -721,7 +737,15 @@ class ManagerApiClient:
         )
 
 
-def discover_manager_client(timeout_secs: int = 5) -> Optional[ManagerApiClient]:
+def discover_manager_client(
+    timeout_secs: int = 5, *, strict: bool = False
+) -> Optional[ManagerApiClient]:
+    """Build a client for the manager behind DOCKER_MANAGER_URL or the Docker context.
+
+    ``strict`` raises the concrete reason instead of returning ``None``. Callers that
+    fall back to the plain Docker CLI want the quiet form; callers that are about to
+    report a failure to the user must not discard why discovery failed.
+    """
     try:
         target = _manager_target_from_env()
         if target:
@@ -729,11 +753,26 @@ def discover_manager_client(timeout_secs: int = 5) -> Optional[ManagerApiClient]
         elif shutil.which("docker"):
             _, context_target = current_docker_context_target()
             if not context_target or not context_target.startswith(("tcp://", "http://", "https://")):
+                if strict:
+                    raise RuntimeError(
+                        "no Docker-Manager endpoint found: set DOCKER_MANAGER_URL, or select a "
+                        f"docker context with a tcp:// endpoint (current target: {context_target or 'none'})"
+                    )
                 return None
             config = resolve_login_config(manager_target=context_target)
         else:
+            if strict:
+                raise RuntimeError(
+                    "no Docker-Manager endpoint found: DOCKER_MANAGER_URL is unset and the docker CLI is not installed"
+                )
             return None
-    except Exception:
+    except RuntimeError:
+        if strict:
+            raise
+        return None
+    except Exception as exc:
+        if strict:
+            raise RuntimeError(f"failed resolving the Docker-Manager endpoint: {exc}") from exc
         return None
 
     return ManagerApiClient(

{docker_stack-2.2.4.dist-info → docker_stack-2.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docker-stack
-Version: 2.2.4
+Version: 2.2.5
 Summary: CLI for deploying and managing Docker stacks.
 Home-page: https://github.com/mesudip/docker-stack
 Author: Sudip Bhattarai

{docker_stack-2.2.4.dist-info → docker_stack-2.2.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker_stack/__init__.py,sha256=qgHdW8ZDBlyk6FzIf8Mld_cJD1SjOfqo2dELg4pK668,880
-docker_stack/cli.py,sha256=_IWypxyKZ4reUaB4qb7WpRt24WtUVWLlmrr3ALY8riM,96017
+docker_stack/cli.py,sha256=NlUsiSLLrP7drUP5FCj8bwdc32ZFe6d2wHP_tQMnFk0,96797
 docker_stack/command_runner.py,sha256=mNaUAVKtrJbji_5ARVPLKhc92avqllNKrVQj1A6S0dA,1252
 docker_stack/compose.py,sha256=_fAVesjyW5ecid46sYYhcu02yF1vqknDSCFYflJPDOE,534
 docker_stack/docker_objects.py,sha256=U6szytv5gKrmBYKqThSeMMXdiJ2u4STIQLkeqQ-Fn4Q,12103
@@ -7,14 +7,14 @@ docker_stack/envsubst.py,sha256=gdEUpsjWJeNbbahySk56vUdQh1nns85o3LbU6SUBo3I,8337
 docker_stack/envsubst_merge.py,sha256=TwOu8BducG0rWnSreJGwesNi-VghCetljcf-aWceE8M,4971
 docker_stack/helpers.py,sha256=nJHaIS1vtFyPYclXVl3-Qd-1h55jnSy1LwdATDrF4hk,5953
 docker_stack/login.py,sha256=jnrmrDh79Brlzj89YdZ1sGpg-ex16yb3ZN47eFpcW5g,41754
-docker_stack/manager_api.py,sha256=xb8RwY4LEn1usg9qhG9AfiCvBJ2tpQawVMLRwF3vYHY,28361
+docker_stack/manager_api.py,sha256=ZTHcudzHuLq0dDN-qu51nJyX0hQy5PEPHvf807y3jyw,30194
 docker_stack/markers.py,sha256=gqStnr0tNWZ1kzqvREc2jVQVQrevheShgJtL5QzSx4g,2388
 docker_stack/merge_conf.py,sha256=Pmsabcgf3SDyaWvf2OLsBPodzEqsvOIjj9xzn_qWXH0,1917
 docker_stack/registry.py,sha256=sWC1J9JDIrcYyhei1POYCZHJ0xUCKC2pveisSHMgYsQ,9036
 docker_stack/shell_auth.py,sha256=UUu9y4wMFKfc_j86yGcasvS_TLZ2uV4kv0T4XKTMQBQ,33424
 docker_stack/url_parser.py,sha256=Sk8GQE0nEiwCkijp1OltP2AfgtKEmM2hybcH_rBhfiI,6824
-docker_stack-2.2.4.dist-info/METADATA,sha256=__Y1aknQuctP1Nuf2zhuinUnlyYDu-qGY54rUma8alM,13821
-docker_stack-2.2.4.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-docker_stack-2.2.4.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
-docker_stack-2.2.4.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
-docker_stack-2.2.4.dist-info/RECORD,,
+docker_stack-2.2.5.dist-info/METADATA,sha256=4cqUzfi3pZrTNSL1oqrf9xW0RN4ijdVvSXZAbULFqwY,13821
+docker_stack-2.2.5.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+docker_stack-2.2.5.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
+docker_stack-2.2.5.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
+docker_stack-2.2.5.dist-info/RECORD,,