1fca917ad1
`-v` magically creates the source destination as a directory, if it doesn't exist already. We'd like to avoid this magic and the potential breakage that it might cause. We'd rather fail while Docker tries to find things to `--mount` than have it automatically create directories and fail anyway, while having contaminated the filesystem. There's a lot more `-v` instances remaining to be fixed later on. This is just some start. Things like `matrix_synapse_container_additional_volumes` and `matrix_nginx_proxy_container_additional_volumes` were not changed to use `--mount`, as options for each one are passed differently (`ro` is `ro`, but `rw` doesn't exist and `slave` is `bind-propagation=slave`). To avoid breaking people's custom volume mounts, we keep it as it is for now. A deficiency with `--mount` is that it lacks the `z` option (SELinux ownership changes), and some of our `-v` instances use that. I'm not sure how supported SELinux is for us right now, but it might be, and breaking that would not be a good idea.
38 lines
1.3 KiB
Django/Jinja
38 lines
1.3 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix jitsi-jvb server
|
|
{% for service in matrix_jitsi_jvb_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-jitsi-jvb
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-jitsi-jvb
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-jvb \
|
|
--log-driver=none \
|
|
--network={{ matrix_docker_network }} \
|
|
--env-file={{ matrix_jitsi_jvb_base_path }}/env \
|
|
{% if matrix_jitsi_jvb_container_rtp_udp_host_bind_port %}
|
|
-p {{ matrix_jitsi_jvb_container_rtp_udp_host_bind_port }}:{{ matrix_jitsi_jvb_rtp_udp_port }}/udp \
|
|
{% endif %}
|
|
{% if matrix_jitsi_jvb_container_rtp_tcp_host_bind_port %}
|
|
-p {{ matrix_jitsi_jvb_container_rtp_tcp_host_bind_port }}:{{ matrix_jitsi_jvb_rtp_tcp_port }} \
|
|
{% endif %}
|
|
--mount type=bind,src={{ matrix_jitsi_jvb_config_path }},dst=/config \
|
|
{% for arg in matrix_jitsi_jvb_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_jitsi_jvb_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_docker }} kill matrix-jitsi-jvb
|
|
ExecStop=-{{ matrix_host_command_docker }} rm matrix-jitsi-jvb
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-jitsi-jvb
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|