fix(deploy): pass registry auth to all swarm nodes (#78)
Connectivity tester is global but fails on rudolf-T with `No such image` because deploy does not pass registry credentials to Swarm workers. This branch includes the connectivity_tester stack work plus `--with-registry-auth` in `docker stack deploy`. Observed before merge: 3-node Swarm, 2 running tasks; rudolf-T rejects the pull. Verify 3/3 after deployment. --------- Co-authored-by: hermes <hermes@rudolf.keenetic.link> Co-authored-by: brencher_bot <rudolfss13@gmail.com> Reviewed-on: #78 Co-authored-by: hermes <rudolfss13+hermes@gmail.com>
This commit was merged in pull request #78.
This commit is contained in:
@@ -296,6 +296,7 @@ class DockerSwarmDeploy(AbstractStep[str]):
|
||||
# Deploy stack to Docker Swarm
|
||||
cmd = [
|
||||
"docker", "stack", "deploy",
|
||||
"--with-registry-auth",
|
||||
"--detach=false",
|
||||
"--prune",
|
||||
"-c", tmp_compose_path,
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
from typing import Any, Callable, Dict
|
||||
|
||||
import yaml
|
||||
from enironment import AbstractStep
|
||||
from steps.git import GitClone
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class DockerComposePull(AbstractStep[Dict[str, str]]):
|
||||
"""Pull images referenced by a docker-compose file from a remote registry."""
|
||||
|
||||
def __init__(self,
|
||||
wd: GitClone,
|
||||
docker_compose_path: str,
|
||||
envs: Callable[[], Dict[str, Any]],
|
||||
**kwargs: Any) -> None:
|
||||
super().__init__(**kwargs)
|
||||
self.wd = wd
|
||||
self.envs = envs
|
||||
self.docker_compose_path = docker_compose_path
|
||||
|
||||
def progress(self) -> Dict[str, str]:
|
||||
env = self.envs()
|
||||
compose_path = os.path.join(self.wd.progress(), self.docker_compose_path)
|
||||
with open(compose_path, "r") as f:
|
||||
content = f.read()
|
||||
content = re.sub(r"\$\{([^}]+)\}", lambda m: env.get(m.group(1), ""), content)
|
||||
compose = yaml.safe_load(content)
|
||||
for svc in compose.get("services", {}).values():
|
||||
if "build" in svc:
|
||||
del svc["build"]
|
||||
tmp_path = compose_path + ".pull.yml"
|
||||
with open(tmp_path, "w") as f:
|
||||
yaml.safe_dump(compose, f)
|
||||
try:
|
||||
subprocess.run(
|
||||
["docker", "compose", "-f", tmp_path, "pull"],
|
||||
check=True,
|
||||
cwd=self.wd.progress(),
|
||||
)
|
||||
finally:
|
||||
os.unlink(tmp_path)
|
||||
return {name: svc.get("image", "") for name, svc in compose.get("services", {}).items()}
|
||||
Reference in New Issue
Block a user