docker: remove echobot parts that were lingering in the feature branch

This commit is contained in:
j4n
2026-02-13 14:19:47 +01:00
parent 23ddd087ad
commit c68df8551c
3 changed files with 4 additions and 17 deletions

View File

@@ -125,19 +125,6 @@ def run_cmd(args, out):
else: else:
out.red("Website deployment failed.") out.red("Website deployment failed.")
elif retcode == 0: 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.") out.green("Deploy completed, call `cmdeploy dns` next.")
elif not args.dns_check_disabled and not remote_data["acme_account_url"]: elif not args.dns_check_disabled and not remote_data["acme_account_url"]:
out.red("Deploy completed but letsencrypt not configured") out.red("Deploy completed but letsencrypt not configured")

View File

@@ -16,6 +16,7 @@ def main():
disable_mail = bool(os.environ.get("CHATMAIL_DISABLE_MAIL")) disable_mail = bool(os.environ.get("CHATMAIL_DISABLE_MAIL"))
website_only = bool(os.environ.get("CHATMAIL_WEBSITE_ONLY")) website_only = bool(os.environ.get("CHATMAIL_WEBSITE_ONLY"))
docker = bool(os.environ.get("CHATMAIL_DOCKER")) docker = bool(os.environ.get("CHATMAIL_DOCKER"))
deploy_chatmail(config_path, disable_mail, website_only, docker) deploy_chatmail(config_path, disable_mail, website_only, docker)

View File

@@ -1,13 +1,13 @@
services: services:
chatmail: chatmail:
build: build:
context: ./docker context: ./docker
dockerfile: chatmail_relay.dockerfile dockerfile: chatmail_relay.dockerfile
tags: tags:
- chatmail-relay:latest - chatmail-relay:latest
image: chatmail-relay:latest image: chatmail-relay:latest
restart: unless-stopped restart: unless-stopped
container_name: chatmail container_name: chatmail
cgroup: host # required for systemd cgroup: host # required for systemd
tty: true # required for logs tty: true # required for logs
tmpfs: # required for systemd tmpfs: # required for systemd
@@ -36,11 +36,10 @@ services:
## system ## system
- /sys/fs/cgroup:/sys/fs/cgroup:rw # required for systemd - /sys/fs/cgroup:/sys/fs/cgroup:rw # required for systemd
- ./:/opt/chatmail - ./:/opt/chatmail
## data ## data
- ./data/chatmail:/home - ./data/chatmail:/home
- ./data/chatmail-dkimkeys:/etc/dkimkeys - ./data/chatmail-dkimkeys:/etc/dkimkeys
- ./data/chatmail-echobot:/run/echobot
- ./data/chatmail-acme:/var/lib/acme - ./data/chatmail-acme:/var/lib/acme
## custom resources ## custom resources