d08b27784f
The Docker 19.04 -> 20.10 upgrade contains the following change in `/usr/lib/systemd/system/docker.service`: ``` -BindsTo=containerd.service -After=network-online.target firewalld.service containerd.service +After=network-online.target firewalld.service containerd.service multi-user.target -Requires=docker.socket +Requires=docker.socket containerd.service Wants=network-online.target ``` The `multi-user.target` requirement in `After` seems to be in conflict with our `WantedBy=multi-user.target` and `After=docker.service` / `Requires=docker.service` definitions, causing the following error on startup for all of our systemd services: > Job matrix-synapse.service/start deleted to break ordering cycle starting with multi-user.target/start A workaround which appears to work is to add `DefaultDependencies=no` to all of our services.
36 lines
1 KiB
Django/Jinja
36 lines
1 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_server_fqn_matrix }} \
|
|
{% 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
|