docker-stack 2__py3-none-any.whl → 2.0.2__py3-none-any.whl

docker_stack/cli.py

@@ -639,10 +639,9 @@ class DockerStack:
             )
             return
 
-        _, cmd = self.docker.config.increment(stack_name, rendered_content, labels=labels, stack=stack_name)
-        if not cmd.isNop():
-            self.commands.append(cmd)
-
+        # Manager-backed deploys must stay on the manager stack APIs. Hitting
+        # direct daemon config endpoints here breaks GitHub OIDC workflows,
+        # which are intentionally restricted away from generic daemon access.
         if manager_deploy and not with_registry_auth:
             self.commands.append(
                 CallbackCommand(
@@ -657,6 +656,10 @@ class DockerStack:
             )
             return
 
+        _, cmd = self.docker.config.increment(stack_name, rendered_content, labels=labels, stack=stack_name)
+        if not cmd.isNop():
+            self.commands.append(cmd)
+
         cmd = ["docker", "stack", "deploy", "-c", str(rendered_filename), stack_name]
         if with_registry_auth:
             cmd.insert(3, "--with-registry-auth")

docker_stack/manager_api.py

@@ -48,6 +48,28 @@ def _manager_target_from_env() -> Optional[str]:
     return None
 
 
+def _format_control_plane_endpoints(endpoints: Any) -> str:
+    if not isinstance(endpoints, list) or not endpoints:
+        return "none"
+    values = []
+    for item in endpoints:
+        if not isinstance(item, dict):
+            continue
+        endpoint_id = item.get("id")
+        name = str(item.get("name") or "").strip()
+        slug = str(item.get("slug") or "").strip()
+        parts = []
+        if endpoint_id is not None:
+            parts.append(f"id={endpoint_id}")
+        if name:
+            parts.append(f"name={name}")
+        if slug:
+            parts.append(f"slug={slug}")
+        if parts:
+            values.append(", ".join(parts))
+    return "; ".join(values) if values else "none"
+
+
 class ManagerApiClient:
     def __init__(
         self,
@@ -134,70 +156,13 @@ class ManagerApiClient:
 
         self._endpoint_id_checked = True
 
-        env_endpoint_id = os.getenv("DOCKER_MANAGER_ENDPOINT_ID", "").strip()
-        if env_endpoint_id:
-            try:
-                parsed_id = int(env_endpoint_id)
-            except ValueError as exc:
-                raise RuntimeError("DOCKER_MANAGER_ENDPOINT_ID must be a positive integer") from exc
-            if parsed_id <= 0:
-                raise RuntimeError("DOCKER_MANAGER_ENDPOINT_ID must be a positive integer")
-            self._endpoint_id = parsed_id
-            return parsed_id
-
         payload = self._request_json("/api/endpoints")
         endpoints = payload.get("endpoints")
-        if not isinstance(endpoints, list) or not endpoints:
-            raise RuntimeError("No visible Docker-Manager endpoints available")
-
-        endpoint_slug = os.getenv("DOCKER_MANAGER_ENDPOINT_SLUG", "").strip()
-        endpoint_name = os.getenv("DOCKER_MANAGER_ENDPOINT_NAME", "").strip()
-        selected = None
-
-        if endpoint_slug:
-            selected = next(
-                (
-                    item
-                    for item in endpoints
-                    if isinstance(item, dict) and str(item.get("slug", "")).strip() == endpoint_slug
-                ),
-                None,
-            )
-            if selected is None:
-                raise RuntimeError(
-                    f"Could not find endpoint with slug '{endpoint_slug}'. "
-                    "Set DOCKER_MANAGER_ENDPOINT_ID to select explicitly."
-                )
-        elif endpoint_name:
-            selected = next(
-                (
-                    item
-                    for item in endpoints
-                    if isinstance(item, dict) and str(item.get("name", "")).strip() == endpoint_name
-                ),
-                None,
-            )
-            if selected is None:
-                raise RuntimeError(
-                    f"Could not find endpoint with name '{endpoint_name}'. "
-                    "Set DOCKER_MANAGER_ENDPOINT_ID to select explicitly."
-                )
-        else:
-            selected = next((item for item in endpoints if isinstance(item, dict)), None)
-
-        if not isinstance(selected, dict):
-            raise RuntimeError("Docker-Manager endpoint payload is invalid")
-
-        try:
-            endpoint_id = int(selected.get("id"))
-        except (TypeError, ValueError) as exc:
-            raise RuntimeError("Docker-Manager endpoint payload is missing a valid id") from exc
-
-        if endpoint_id <= 0:
-            raise RuntimeError("Docker-Manager endpoint id must be positive")
-
-        self._endpoint_id = endpoint_id
-        return endpoint_id
+        raise RuntimeError(
+            "docker-stack does not support Docker-Manager control-plane targets. "
+            "Point DOCKER_MANAGER_URL at a direct manager stack API instead. "
+            f"Visible endpoints: {_format_control_plane_endpoints(endpoints)}"
+        )
 
     def _endpoint_path(self, suffix: str) -> str:
         normalized = suffix if suffix.startswith("/") else f"/{suffix}"
@@ -208,13 +173,9 @@ class ManagerApiClient:
         features = self.detect_features()
         if feature_name not in features:
             return False
-        if feature_name in {FEATURE_STACK_QUERY, FEATURE_STACK_DEPLOY}:
+        if feature_name == FEATURE_STACK_DEPLOY:
             if not self._detect_manager_backend():
                 return False
-            try:
-                self._resolve_endpoint_id()
-            except RuntimeError:
-                return False
         return True
 
     def list_stacks(self) -> Dict[str, Any]:
@@ -300,7 +261,7 @@ class ManagerApiClient:
         if options:
             payload["options"] = options
         return self._request_json(
-            self._endpoint_path("/stacks/validate"),
+            "/api/stacks/validate",
             method="POST",
             payload=payload,
         )
@@ -317,7 +278,7 @@ class ManagerApiClient:
         if options:
             payload["options"] = options
         return self._request_json(
-            self._endpoint_path("/stacks/deploy"),
+            "/api/stacks/deploy",
             method="POST",
             payload=payload,
         )

{docker_stack-2.0.0.dist-info → docker_stack-2.0.2.dist-info}/METADATA

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

{docker_stack-2.0.0.dist-info → docker_stack-2.0.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker_stack/__init__.py,sha256=22W2926fX4sMA1POE1EligVb05cbmP8I6rnacEUmaFs,879
-docker_stack/cli.py,sha256=_90wyc2V-8LGpOHWIL0sHjh2hqL-i4hOLw8f4C4dfbY,50338
+docker_stack/cli.py,sha256=fsjXjaGFBXi-uYtAm5jcYSPg-yafaVsENsjKK9o_55g,50570
 docker_stack/command_runner.py,sha256=mNaUAVKtrJbji_5ARVPLKhc92avqllNKrVQj1A6S0dA,1252
 docker_stack/compose.py,sha256=_fAVesjyW5ecid46sYYhcu02yF1vqknDSCFYflJPDOE,534
 docker_stack/docker_objects.py,sha256=6FYi3Cq5qTkz2XgRrb_DGy2tgX8uoagib6bZD_Bs3W4,10922
@@ -7,13 +7,13 @@ docker_stack/envsubst.py,sha256=gdEUpsjWJeNbbahySk56vUdQh1nns85o3LbU6SUBo3I,8337
 docker_stack/envsubst_merge.py,sha256=TwOu8BducG0rWnSreJGwesNi-VghCetljcf-aWceE8M,4971
 docker_stack/helpers.py,sha256=7zQT_lYU6IcqjSOYjE0JlHRtbB8Sffz3XlJKyNvot6U,5580
 docker_stack/login.py,sha256=_4sx0hltvKnwA81r_HyYkdQjXs5AEPlh_Qy87sUfcP0,30996
-docker_stack/manager_api.py,sha256=bB7CKKVnLiLC_mvd6lej-QRZcssWIsG80FLUQgHE5q8,13184
+docker_stack/manager_api.py,sha256=MrPKfbykRHgGoEl-1qehJBdaxncXGvzN_ef5Q2QBPXk,11486
 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/url_parser.py,sha256=Sk8GQE0nEiwCkijp1OltP2AfgtKEmM2hybcH_rBhfiI,6824
-docker_stack-2.0.0.dist-info/METADATA,sha256=7uB1n03OeTNV4UedOplrmjuot_gycHSb3iZBeWmHAAY,8753
-docker_stack-2.0.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-docker_stack-2.0.0.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
-docker_stack-2.0.0.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
-docker_stack-2.0.0.dist-info/RECORD,,
+docker_stack-2.0.2.dist-info/METADATA,sha256=GUpDIRMWkpz6IFjZUGhHU9qhaEMmU2WYfyEweLaLyVE,8753
+docker_stack-2.0.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+docker_stack-2.0.2.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
+docker_stack-2.0.2.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
+docker_stack-2.0.2.dist-info/RECORD,,