From d2ff81272792afd7742e964c433fe9defba11dc5 Mon Sep 17 00:00:00 2001
From: missytake <missytake@systemli.org>
Date: Tue, 26 Aug 2025 10:33:14 +0200
Subject: [PATCH] cmdeploy: split @local and @docker in SSHExec

---
 cmdeploy/src/cmdeploy/cmdeploy.py     | 4 +++-
 docker/files/setup_chatmail_docker.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py
index 2eea6546..3362c0e9 100644
--- a/cmdeploy/src/cmdeploy/cmdeploy.py
+++ b/cmdeploy/src/cmdeploy/cmdeploy.py
@@ -101,7 +101,7 @@ def run_cmd(args, out):
     ssh_host = args.config.mail_domain if not args.ssh_host else args.ssh_host
 
     cmd = f"{pyinf} --ssh-user root {ssh_host} {deploy_path} -y"
-    if sshexec == "localhost":
+    if sshexec in ["docker", "localhost"]:
         cmd = f"{pyinf} @local {deploy_path} -y"
 
     if version.parse(pyinfra.__version__) < version.parse("3"):
@@ -368,6 +368,8 @@ def main(args=None):
         host = args.ssh_host if hasattr(args, "ssh_host") and args.ssh_host else args.config.mail_domain
         if host in [ "@local", "localhost" ]:
             return "localhost"
+        elif host == "docker":
+            return "docker"
         
         print(f"[ssh] login to {host}")
         return SSHExec(host, verbose=args.verbose)
diff --git a/docker/files/setup_chatmail_docker.sh b/docker/files/setup_chatmail_docker.sh
index 64d7af36..dafeb2df 100755
--- a/docker/files/setup_chatmail_docker.sh
+++ b/docker/files/setup_chatmail_docker.sh
@@ -70,7 +70,7 @@ fi
 ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN
 bash /update_ini.sh
 
-./scripts/cmdeploy run --ssh-host @local --skip-dns-check
+./scripts/cmdeploy run --ssh-host docker --skip-dns-check
 
 echo "ForwardToConsole=yes" >> /etc/systemd/journald.conf
 systemctl restart systemd-journald