mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-12 08:43:55 +02:00
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.
46 lines
1.7 KiB
Django/Jinja
46 lines
1.7 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix Mx Puppet Twitter bridge
|
|
{% for service in matrix_mx_puppet_twitter_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
{% for service in matrix_mx_puppet_twitter_systemd_wanted_services_list %}
|
|
Wants={{ service }}
|
|
{% endfor %}
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mx-puppet-twitter
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mx-puppet-twitter
|
|
|
|
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
|
ExecStartPre={{ matrix_host_command_sleep }} 5
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mx-puppet-twitter \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--network={{ matrix_docker_network }} \
|
|
{% if matrix_mx_puppet_twitter_container_http_host_bind_port %}
|
|
-p {{ matrix_mx_puppet_twitter_container_http_host_bind_port }}:{{ matrix_mx_puppet_twitter_appservice_port }} \
|
|
{% endif %}
|
|
-e CONFIG_PATH=/config/config.yaml \
|
|
-e REGISTRATION_PATH=/config/registration.yaml \
|
|
-v {{ matrix_mx_puppet_twitter_config_path }}:/config:z \
|
|
-v {{ matrix_mx_puppet_twitter_data_path }}:/data:z \
|
|
{% for arg in matrix_mx_puppet_twitter_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_mx_puppet_twitter_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_docker }} kill matrix-mx-puppet-twitter
|
|
ExecStop=-{{ matrix_host_command_docker }} rm matrix-mx-puppet-twitter
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-mx-puppet-twitter
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|