From 1889f554a3288c08d5b7dd5d5fd9a063e6bda47b Mon Sep 17 00:00:00 2001 From: j4n Date: Fri, 13 Feb 2026 14:19:47 +0100 Subject: [PATCH] docker: remove echobot parts that were lingering in the feature branch --- cmdeploy/src/cmdeploy/cmdeploy.py | 13 ------------- cmdeploy/src/cmdeploy/run.py | 1 + docker-compose.yaml | 7 +++---- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py index 9888b007..4336f102 100644 --- a/cmdeploy/src/cmdeploy/cmdeploy.py +++ b/cmdeploy/src/cmdeploy/cmdeploy.py @@ -125,19 +125,6 @@ def run_cmd(args, out): else: out.red("Website deployment failed.") elif retcode == 0: - if not args.disable_mail: - print("\nYou can try out the relay by talking to this echo bot: ") - sshexec = SSHExec(args.config.mail_domain, verbose=args.verbose) - print( - sshexec( - call=remote.rshell.shell, - kwargs=dict(command="cat /var/lib/echobot/invite-link.txt"), - ) - ) - - server_deployed_message = f"Chatmail server started: https://{args.config.mail_domain}/" - delimiter_line = "=" * len(server_deployed_message) - out.green(f"{delimiter_line}\n{server_deployed_message}\n{delimiter_line}") out.green("Deploy completed, call `cmdeploy dns` next.") elif not args.dns_check_disabled and not remote_data["acme_account_url"]: out.red("Deploy completed but letsencrypt not configured") diff --git a/cmdeploy/src/cmdeploy/run.py b/cmdeploy/src/cmdeploy/run.py index 91f96d7d..e95d5a1e 100644 --- a/cmdeploy/src/cmdeploy/run.py +++ b/cmdeploy/src/cmdeploy/run.py @@ -16,6 +16,7 @@ def main(): disable_mail = bool(os.environ.get("CHATMAIL_DISABLE_MAIL")) website_only = bool(os.environ.get("CHATMAIL_WEBSITE_ONLY")) docker = bool(os.environ.get("CHATMAIL_DOCKER")) + deploy_chatmail(config_path, disable_mail, website_only, docker) diff --git a/docker-compose.yaml b/docker-compose.yaml index b339812d..a8147643 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,13 +1,13 @@ services: chatmail: - build: + build: context: ./docker dockerfile: chatmail_relay.dockerfile tags: - chatmail-relay:latest image: chatmail-relay:latest restart: unless-stopped - container_name: chatmail + container_name: chatmail cgroup: host # required for systemd tty: true # required for logs tmpfs: # required for systemd @@ -36,11 +36,10 @@ services: ## system - /sys/fs/cgroup:/sys/fs/cgroup:rw # required for systemd - ./:/opt/chatmail - + ## data - ./data/chatmail:/home - ./data/chatmail-dkimkeys:/etc/dkimkeys - - ./data/chatmail-echobot:/run/echobot - ./data/chatmail-acme:/var/lib/acme ## custom resources