mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-07 19:27:35 +01:00
7593d969e3
Starting with Docker 20.10, `--hostname` seems to have the side-effect of making Docker's internal DNS server resolve said hostname to the IP address of the container. Because we were giving the mailer service a hostname of `matrix.DOMAIN`, all requests destined for `matrix.DOMAIN` originating from other services on the container network were resolving to `matrix-mailer`. This is obviously wrong. Initially reported here: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/748 We normally try to not use the public hostname (and IP address) on the container network and try to make services talk to one another locally, but it sometimes could happen. With this, we use a `matrix-mailer` hostname for the matrix-mailer container. My testing shows that it doesn't cause any trouble with email deliverability.
36 lines
1.0 KiB
Django/Jinja
36 lines
1.0 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix mailer
|
|
After=docker.service
|
|
Requires=docker.service
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mailer
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mailer
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mailer \
|
|
--log-driver=none \
|
|
--user={{ matrix_mailer_container_user_uid }}:{{ matrix_mailer_container_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--read-only \
|
|
--init \
|
|
--tmpfs=/var/spool/exim:rw,noexec,nosuid,size=100m \
|
|
--network={{ matrix_docker_network }} \
|
|
--env-file={{ matrix_mailer_base_path }}/env-mailer \
|
|
--hostname=matrix-mailer \
|
|
{% for arg in matrix_mailer_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_mailer_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_docker }} kill matrix-mailer
|
|
ExecStop=-{{ matrix_host_command_docker }} rm matrix-mailer
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-mailer
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|