Remove some more -v usage
Continuation of 1fca917ad1
.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/722
This commit is contained in:
parent
1fca917ad1
commit
75f9fde7a4
@ -21,8 +21,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-matrix-rem
|
|||||||
--read-only \
|
--read-only \
|
||||||
--network={{ matrix_docker_network }} \
|
--network={{ matrix_docker_network }} \
|
||||||
-e 'TZ={{ matrix_bot_matrix_reminder_bot_reminders_timezone }}' \
|
-e 'TZ={{ matrix_bot_matrix_reminder_bot_reminders_timezone }}' \
|
||||||
-v {{ matrix_bot_matrix_reminder_bot_config_path }}:/config:ro \
|
--mount type=bind,src={{ matrix_bot_matrix_reminder_bot_config_path }},dst=/config,ro \
|
||||||
-v {{ matrix_bot_matrix_reminder_bot_data_path }}:/data:rw \
|
--mount type=bind,src={{ matrix_bot_matrix_reminder_bot_data_path }},dst=/data \
|
||||||
--entrypoint=/bin/sh \
|
--entrypoint=/bin/sh \
|
||||||
{% for arg in matrix_bot_matrix_reminder_bot_container_extra_arguments %}
|
{% for arg in matrix_bot_matrix_reminder_bot_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
{{ matrix_host_command_docker }} run --rm --name matrix-appservice-discord-link-gen
|
{{ matrix_host_command_docker }} run --rm --name matrix-appservice-discord-link-gen
|
||||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
-v {{ matrix_appservice_discord_config_path }}:/cfg
|
--mount type=bind,src={{ matrix_appservice_discord_config_path }},dst=/cfg
|
||||||
-w /cfg
|
-w /cfg
|
||||||
{{ matrix_appservice_discord_docker_image }}
|
{{ matrix_appservice_discord_docker_image }}
|
||||||
/bin/sh -c "node /build/tools/addbot.js > /cfg/invite_link"
|
/bin/sh -c "node /build/tools/addbot.js > /cfg/invite_link"
|
||||||
|
@ -25,8 +25,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-appservice-dis
|
|||||||
{% if matrix_appservice_discord_container_http_host_bind_port %}
|
{% if matrix_appservice_discord_container_http_host_bind_port %}
|
||||||
-p {{ matrix_appservice_discord_container_http_host_bind_port }}:9005 \
|
-p {{ matrix_appservice_discord_container_http_host_bind_port }}:9005 \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v {{ matrix_appservice_discord_config_path }}:/cfg \
|
--mount type=bind,src={{ matrix_appservice_discord_config_path }},dst=/cfg \
|
||||||
-v {{ matrix_appservice_discord_data_path }}:/data \
|
--mount type=bind,src={{ matrix_appservice_discord_data_path }},dst=/data \
|
||||||
{% for arg in matrix_appservice_discord_container_extra_arguments %}
|
{% for arg in matrix_appservice_discord_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -23,9 +23,9 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-corporal \
|
|||||||
{% if matrix_corporal_container_http_api_host_bind_port %}
|
{% if matrix_corporal_container_http_api_host_bind_port %}
|
||||||
-p {{ matrix_corporal_container_http_api_host_bind_port }}:41081 \
|
-p {{ matrix_corporal_container_http_api_host_bind_port }}:41081 \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v {{ matrix_corporal_config_dir_path }}:/etc/matrix-corporal:ro \
|
--mount type=bind,src={{ matrix_corporal_config_dir_path }},dst=/etc/matrix-corporal,ro \
|
||||||
-v {{ matrix_corporal_cache_dir_path }}:/var/cache/matrix-corporal:rw \
|
--mount type=bind,src={{ matrix_corporal_cache_dir_path }},dst=/var/cache/matrix-corporal \
|
||||||
-v {{ matrix_corporal_var_dir_path }}:/var/matrix-corporal:rw \
|
--mount type=bind,src={{ matrix_corporal_var_dir_path }},dst=/var/matrix-corporal \
|
||||||
{% for arg in matrix_corporal_container_extra_arguments %}
|
{% for arg in matrix_corporal_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -30,7 +30,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-coturn \
|
|||||||
{% if matrix_coturn_container_turn_range_listen_interface is not none %}
|
{% if matrix_coturn_container_turn_range_listen_interface is not none %}
|
||||||
-p {{ matrix_coturn_container_turn_range_listen_interface }}{{ ':' if matrix_coturn_container_turn_range_listen_interface else '' }}{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}:{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp \
|
-p {{ matrix_coturn_container_turn_range_listen_interface }}{{ ':' if matrix_coturn_container_turn_range_listen_interface else '' }}{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}:{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v {{ matrix_coturn_config_path }}:/turnserver.conf:ro \
|
--mount type=bind,src={{ matrix_coturn_config_path }},dst=/turnserver.conf,ro \
|
||||||
{% for volume in matrix_coturn_container_additional_volumes %}
|
{% for volume in matrix_coturn_container_additional_volumes %}
|
||||||
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
|
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -35,8 +35,8 @@
|
|||||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
-p {{ matrix_ssl_lets_encrypt_container_standalone_http_host_bind_port }}:8080
|
-p {{ matrix_ssl_lets_encrypt_container_standalone_http_host_bind_port }}:8080
|
||||||
-v {{ matrix_ssl_config_dir_path }}:/etc/letsencrypt
|
--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst=/etc/letsencrypt
|
||||||
-v {{ matrix_ssl_log_dir_path }}:/var/log/letsencrypt
|
--mount type=bind,src={{ matrix_ssl_log_dir_path }},dst=/var/log/letsencrypt
|
||||||
{{ matrix_ssl_lets_encrypt_certbot_docker_image }}
|
{{ matrix_ssl_lets_encrypt_certbot_docker_image }}
|
||||||
certonly
|
certonly
|
||||||
--non-interactive
|
--non-interactive
|
||||||
@ -63,8 +63,8 @@
|
|||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
-p 127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }}:8080
|
-p 127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }}:8080
|
||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
-v {{ matrix_ssl_config_dir_path }}:/etc/letsencrypt
|
--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst=/etc/letsencrypt
|
||||||
-v {{ matrix_ssl_log_dir_path }}:/var/log/letsencrypt
|
--mount type=bind,src={{ matrix_ssl_log_dir_path }},dst=/var/log/letsencrypt
|
||||||
{{ matrix_ssl_lets_encrypt_certbot_docker_image }}
|
{{ matrix_ssl_lets_encrypt_certbot_docker_image }}
|
||||||
certonly
|
certonly
|
||||||
--non-interactive
|
--non-interactive
|
||||||
|
@ -14,8 +14,8 @@ docker run \
|
|||||||
--cap-drop=ALL \
|
--cap-drop=ALL \
|
||||||
--network="{{ matrix_docker_network }}" \
|
--network="{{ matrix_docker_network }}" \
|
||||||
-p 127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }}:8080 \
|
-p 127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }}:8080 \
|
||||||
-v {{ matrix_ssl_config_dir_path }}:/etc/letsencrypt \
|
--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst=/etc/letsencrypt \
|
||||||
-v {{ matrix_ssl_log_dir_path }}:/var/log/letsencrypt \
|
--mount type=bind,src={{ matrix_ssl_log_dir_path }},dst=/var/log/letsencrypt \
|
||||||
{{ matrix_ssl_lets_encrypt_certbot_docker_image }} \
|
{{ matrix_ssl_lets_encrypt_certbot_docker_image }} \
|
||||||
renew \
|
renew \
|
||||||
--non-interactive \
|
--non-interactive \
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
||||||
-v {{ server_path_postgres_dump }}:/{{ server_path_postgres_dump|basename }}:ro
|
--mount type=bind,src={{ server_path_postgres_dump }},dst=/{{ server_path_postgres_dump|basename }},ro
|
||||||
--entrypoint=/bin/sh
|
--entrypoint=/bin/sh
|
||||||
{{ matrix_postgres_docker_image_latest }}
|
{{ matrix_postgres_docker_image_latest }}
|
||||||
-c "cat /{{ server_path_postgres_dump|basename }} |
|
-c "cat /{{ server_path_postgres_dump|basename }} |
|
||||||
|
@ -79,8 +79,8 @@
|
|||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
--entrypoint=python
|
--entrypoint=python
|
||||||
-v {{ matrix_synapse_config_dir_path }}:/data
|
--mount type=bind,src={{ matrix_synapse_config_dir_path }},dst=/data
|
||||||
-v {{ matrix_synapse_config_dir_path }}:/matrix-media-store-parent/media-store
|
--mount type=bind,src={{ matrix_synapse_config_dir_path }},dst=/matrix-media-store-parent/media-store
|
||||||
-v {{ server_path_homeserver_db }}:/{{ server_path_homeserver_db|basename }}
|
--mount type=bind,src={{ server_path_homeserver_db }},dst=/{{ server_path_homeserver_db|basename }}
|
||||||
{{ matrix_synapse_docker_image }}
|
{{ matrix_synapse_docker_image }}
|
||||||
/usr/local/bin/synapse_port_db --sqlite-database /{{ server_path_homeserver_db|basename }} --postgres-config /data/homeserver.yaml
|
/usr/local/bin/synapse_port_db --sqlite-database /{{ server_path_homeserver_db|basename }} --postgres-config /data/homeserver.yaml
|
||||||
|
@ -85,7 +85,7 @@
|
|||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
||||||
--entrypoint=/bin/sh
|
--entrypoint=/bin/sh
|
||||||
-v {{ postgres_dump_dir }}:/out
|
--mount type=bind,src={{ postgres_dump_dir }},dst=/out
|
||||||
{{ matrix_postgres_detected_version_corresponding_docker_image }}
|
{{ matrix_postgres_detected_version_corresponding_docker_image }}
|
||||||
-c "pg_dumpall -h matrix-postgres
|
-c "pg_dumpall -h matrix-postgres
|
||||||
{{ '| gzip -c ' if postgres_dump_name.endswith('.gz') else '' }}
|
{{ '| gzip -c ' if postgres_dump_name.endswith('.gz') else '' }}
|
||||||
@ -131,7 +131,7 @@
|
|||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
||||||
--entrypoint=/bin/sh
|
--entrypoint=/bin/sh
|
||||||
-v {{ postgres_dump_dir }}:/in:ro
|
--mount type=bind,src={{ postgres_dump_dir }},dst=/in,ro
|
||||||
{{ matrix_postgres_docker_image_latest }}
|
{{ matrix_postgres_docker_image_latest }}
|
||||||
-c "cat /in/{{ postgres_dump_name }} |
|
-c "cat /in/{{ postgres_dump_name }} |
|
||||||
{{ 'gunzip |' if postgres_dump_name.endswith('.gz') else '' }}
|
{{ 'gunzip |' if postgres_dump_name.endswith('.gz') else '' }}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
-v {{ matrix_synapse_rust_synapse_compress_state_base_path }}:/work
|
--mount type=bind,src={{ matrix_synapse_rust_synapse_compress_state_base_path }},dst=/work
|
||||||
{{ matrix_synapse_rust_synapse_compress_state_docker_image }}
|
{{ matrix_synapse_rust_synapse_compress_state_docker_image }}
|
||||||
/synapse-compress-state -t -o /work/state-compressor.sql
|
/synapse-compress-state -t -o /work/state-compressor.sql
|
||||||
-p "host={{ matrix_synapse_database_host }} user={{ matrix_synapse_database_user }} password={{ matrix_synapse_database_password }} dbname={{ matrix_synapse_database_database }}"
|
-p "host={{ matrix_synapse_database_host }} user={{ matrix_synapse_database_user }} password={{ matrix_synapse_database_password }} dbname={{ matrix_synapse_database_database }}"
|
||||||
@ -30,7 +30,7 @@
|
|||||||
--cap-drop=ALL
|
--cap-drop=ALL
|
||||||
--network={{ matrix_docker_network }}
|
--network={{ matrix_docker_network }}
|
||||||
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
--env-file={{ matrix_postgres_base_path }}/env-postgres-psql
|
||||||
-v {{ matrix_synapse_rust_synapse_compress_state_base_path }}:/work:ro
|
--mount type=bind,src={{ matrix_synapse_rust_synapse_compress_state_base_path }},dst=/work,ro
|
||||||
--entrypoint=/bin/sh
|
--entrypoint=/bin/sh
|
||||||
{{ matrix_postgres_docker_image_latest }}
|
{{ matrix_postgres_docker_image_latest }}
|
||||||
-c "cat /work/state-compressor.sql |
|
-c "cat /work/state-compressor.sql |
|
||||||
|
Loading…
Reference in New Issue
Block a user