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.
34 lines
1.1 KiB
Django/Jinja
34 lines
1.1 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix jitsi-prosody server
|
|
{% for service in matrix_jitsi_prosody_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-jitsi-prosody
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-jitsi-prosody
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-prosody \
|
|
--log-driver=none \
|
|
--network={{ matrix_docker_network }} \
|
|
--env-file={{ matrix_jitsi_prosody_base_path }}/env \
|
|
--mount type=bind,src={{ matrix_jitsi_prosody_config_path }},dst=/config \
|
|
--mount type=bind,src={{ matrix_jitsi_prosody_plugins_path }},dst=/prosody-plugins-custom \
|
|
{% for arg in matrix_jitsi_prosody_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_jitsi_prosody_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_docker }} kill matrix-jitsi-prosody
|
|
ExecStop=-{{ matrix_host_command_docker }} rm matrix-jitsi-prosody
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-jitsi-prosody
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|