mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-28 11:58:31 +01: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.
39 lines
1.6 KiB
Django/Jinja
39 lines
1.6 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix Goofys media store
|
|
After=docker.service
|
|
Requires=docker.service
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill %n
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm %n
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name %n \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--mount type=bind,src=/etc/passwd,dst=/etc/passwd,ro \
|
|
--mount type=bind,src=/etc/group,dst=/etc/group,ro \
|
|
--mount type=bind,src={{ matrix_synapse_media_store_path }},dst=/s3,bind-propagation=shared \
|
|
--security-opt apparmor:unconfined \
|
|
--cap-add mknod \
|
|
--cap-add sys_admin \
|
|
--device=/dev/fuse \
|
|
--env-file={{ matrix_synapse_config_dir_path }}/env-goofys \
|
|
--entrypoint /bin/sh \
|
|
{{ matrix_s3_goofys_docker_image }} \
|
|
-c 'goofys -f{% if not matrix_s3_media_store_custom_endpoint_enabled %} --storage-class=STANDARD_IA{% endif %}{% if matrix_s3_media_store_custom_endpoint_enabled %} --endpoint={{ matrix_s3_media_store_custom_endpoint }}{% endif %} --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3'
|
|
|
|
TimeoutStartSec=5min
|
|
ExecStop=-{{ matrix_host_command_docker }} stop %n
|
|
ExecStop=-{{ matrix_host_command_docker }} kill %n
|
|
ExecStop=-{{ matrix_host_command_docker }} rm %n
|
|
ExecStop=-{{ matrix_host_command_fusermount }} -u {{ matrix_synapse_media_store_path }}
|
|
Restart=always
|
|
RestartSec=5
|
|
SyslogIdentifier=matrix-goofys
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|