docker-stack 2.2.2__tar.gz → 2.2.3__tar.gz

{docker_stack-2.2.2 → docker_stack-2.2.3}/PKG-INFO

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

{docker_stack-2.2.2 → docker_stack-2.2.3}/docker_stack/cli.py

@@ -266,15 +266,35 @@ def _format_names(names: object, *, no_trunc: bool) -> str:
     return ",".join(values)
 
 
+DOCKER_HUB_NAME_PREFIXES = (
+    "docker.io/library/",
+    "index.docker.io/library/",
+    "docker.io/",
+    "index.docker.io/",
+)
+
+
+def _familiar_image_name(value: str) -> str:
+    for prefix in DOCKER_HUB_NAME_PREFIXES:
+        if value.startswith(prefix):
+            return value[len(prefix) :]
+    return value
+
+
 def _format_image(image: object, image_id: object, *, no_trunc: bool) -> str:
     value = str(image or "")
     if not value:
         return "<no image>"
     if no_trunc:
         return value
+    if value.startswith("sha256:"):
+        return _short_id(value)
     identifier = str(image_id or "")
     if identifier and _short_id(identifier) == _short_id(value):
         return _short_id(value)
+    if "@" in value:
+        # docker ps keeps `name[:tag]` and drops the pinned digest unless --no-trunc.
+        return _familiar_image_name(value.split("@", 1)[0])
     return value
 
 

{docker_stack-2.2.2 → docker_stack-2.2.3}/docker_stack.egg-info/PKG-INFO

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

{docker_stack-2.2.2 → docker_stack-2.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="docker-stack",
-    version="2.2.2",
+    version="2.2.3",
     description="CLI for deploying and managing Docker stacks.",
     long_description=open("README.md").read(),  # You can include a README file to describe your package
     long_description_content_type="text/markdown",

{docker_stack-2.2.2 → docker_stack-2.2.3}/tests/test_docker_stack.py

@@ -131,6 +131,57 @@ def test_managed_docker_ps_matches_docker_columns(monkeypatch, capsys):
     assert row == row.rstrip()
 
 
+@pytest.mark.parametrize(
+    "image,expected,expected_no_trunc",
+    [
+        (
+            "registry.example.com/app/design-system:af037b33@sha256:15d623cfa2f856c8101f9f3c47003d412f9b2bf72c69c95d5dff07a74e5f7b60",
+            "registry.example.com/app/design-system:af037b33",
+            "registry.example.com/app/design-system:af037b33@sha256:15d623cfa2f856c8101f9f3c47003d412f9b2bf72c69c95d5dff07a74e5f7b60",
+        ),
+        (
+            "docker.io/library/alpine@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b",
+            "alpine",
+            "docker.io/library/alpine@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b",
+        ),
+        ("nginx:1.27", "nginx:1.27", "nginx:1.27"),
+        (
+            "sha256:0e901e68141fd02f237cf63eb842529f8a9500636a9419e3cf4fb986b8fe3d5d",
+            "0e901e68141f",
+            "sha256:0e901e68141fd02f237cf63eb842529f8a9500636a9419e3cf4fb986b8fe3d5d",
+        ),
+    ],
+)
+def test_managed_docker_ps_drops_pinned_digest_like_docker(monkeypatch, capsys, image, expected, expected_no_trunc):
+    client = SimpleNamespace(
+        supports=lambda feature: feature == "cluster_container_cli_v1",
+        list_containers=lambda **_kwargs: {
+            "containers": [
+                {
+                    "node_name": "worker-02",
+                    "docker": {
+                        "Id": "abcdef1234567890",
+                        "Image": image,
+                        "Command": "sleep",
+                        "Created": int(time.time()) - 60,
+                        "Status": "Up 1 minute",
+                        "Ports": [],
+                        "Names": ["/svc.1.abc"],
+                    },
+                }
+            ],
+            "node_errors": [],
+        },
+    )
+    monkeypatch.setattr("docker_stack.cli.discover_manager_client", lambda: client)
+
+    assert _managed_docker(["ps"]) == 0
+    assert capsys.readouterr().out.splitlines()[1].split()[1] == expected
+
+    assert _managed_docker(["ps", "--no-trunc"]) == 0
+    assert capsys.readouterr().out.splitlines()[1].split()[1] == expected_no_trunc
+
+
 def test_managed_docker_ps_forwards_global_latest_and_limit(monkeypatch):
     calls = []
     client = SimpleNamespace(