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.
45 lines
1.4 KiB
Django/Jinja
45 lines
1.4 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix sms bridge
|
|
{% for service in matrix_sms_bridge_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
{% for service in matrix_sms_bridge_systemd_wanted_services_list %}
|
|
Wants={{ service }}
|
|
{% endfor %}
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-/usr/bin/docker kill matrix-sms-bridge
|
|
ExecStartPre=-/usr/bin/docker rm matrix-sms-bridge
|
|
|
|
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
|
ExecStartPre=/bin/sleep 5
|
|
|
|
ExecStart=/usr/bin/docker run --rm --name matrix-sms-bridge \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--network={{ matrix_docker_network }} \
|
|
{% if matrix_sms_bridge_container_http_host_bind_port %}
|
|
-p {{ matrix_sms_bridge_container_http_host_bind_port }}:8080 \
|
|
{% endif %}
|
|
-v {{ matrix_sms_bridge_config_path }}:/config:z \
|
|
-v {{ matrix_sms_bridge_data_path }}:/data:z \
|
|
--env SPRING_CONFIG_ADDITIONAL_LOCATION=/config/application.yml \
|
|
{% for arg in matrix_sms_bridge_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_sms_bridge_docker_image }}
|
|
|
|
ExecStop=-/usr/bin/docker kill matrix-sms-bridge
|
|
ExecStop=-/usr/bin/docker rm matrix-sms-bridge
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-sms-bridge
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|