docker-stack 2.0.0__tar.gz → 2.0.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {docker_stack-2.0.0 → docker_stack-2.0.1}/PKG-INFO +1 -1
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/cli.py +7 -4
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/PKG-INFO +1 -1
- {docker_stack-2.0.0 → docker_stack-2.0.1}/setup.py +1 -1
- {docker_stack-2.0.0 → docker_stack-2.0.1}/tests/test_docker_stack.py +4 -1
- {docker_stack-2.0.0 → docker_stack-2.0.1}/README.md +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/__init__.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/command_runner.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/compose.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/docker_objects.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/envsubst.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/envsubst_merge.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/helpers.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/login.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/manager_api.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/markers.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/merge_conf.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/registry.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack/url_parser.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/SOURCES.txt +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/dependency_links.txt +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/entry_points.txt +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/requires.txt +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/docker_stack.egg-info/top_level.txt +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/pyproject.toml +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/setup.cfg +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/tests/test_docker_objects.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/tests/test_load_env.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/tests/test_login.py +0 -0
- {docker_stack-2.0.0 → docker_stack-2.0.1}/tests/test_node_ls.py +0 -0
|
@@ -639,10 +639,9 @@ class DockerStack:
|
|
|
639
639
|
)
|
|
640
640
|
return
|
|
641
641
|
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
642
|
+
# Manager-backed deploys must stay on the manager stack APIs. Hitting
|
|
643
|
+
# direct daemon config endpoints here breaks GitHub OIDC workflows,
|
|
644
|
+
# which are intentionally restricted away from generic daemon access.
|
|
646
645
|
if manager_deploy and not with_registry_auth:
|
|
647
646
|
self.commands.append(
|
|
648
647
|
CallbackCommand(
|
|
@@ -657,6 +656,10 @@ class DockerStack:
|
|
|
657
656
|
)
|
|
658
657
|
return
|
|
659
658
|
|
|
659
|
+
_, cmd = self.docker.config.increment(stack_name, rendered_content, labels=labels, stack=stack_name)
|
|
660
|
+
if not cmd.isNop():
|
|
661
|
+
self.commands.append(cmd)
|
|
662
|
+
|
|
660
663
|
cmd = ["docker", "stack", "deploy", "-c", str(rendered_filename), stack_name]
|
|
661
664
|
if with_registry_auth:
|
|
662
665
|
cmd.insert(3, "--with-registry-auth")
|
|
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
|
|
2
2
|
|
|
3
3
|
setup(
|
|
4
4
|
name="docker-stack",
|
|
5
|
-
version="2.0.
|
|
5
|
+
version="2.0.1",
|
|
6
6
|
description="CLI for deploying and managing Docker stacks.",
|
|
7
7
|
long_description=open("README.md").read(), # You can include a README file to describe your package
|
|
8
8
|
long_description_content_type="text/markdown",
|
|
@@ -311,7 +311,10 @@ def test_checkout_uses_manager_fast_path_for_tag(monkeypatch):
|
|
|
311
311
|
def test_deploy_enqueues_manager_callback_when_supported(monkeypatch, tmp_path):
|
|
312
312
|
fake_manager = FakeManagerClient()
|
|
313
313
|
monkeypatch.setattr("docker_stack.cli.discover_manager_client", lambda *_args, **_kwargs: fake_manager)
|
|
314
|
-
monkeypatch.setattr(
|
|
314
|
+
monkeypatch.setattr(
|
|
315
|
+
"docker_stack.cli.run_cli_command",
|
|
316
|
+
lambda *args, **kwargs: pytest.fail("manager-backed deploy should not hit direct daemon CLI"),
|
|
317
|
+
)
|
|
315
318
|
compose_file = tmp_path / "docker-compose.yml"
|
|
316
319
|
compose_file.write_text("services:\n api:\n image: busybox\n")
|
|
317
320
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|