It's the same as `matrix_docker_network` for now, so this practically doesn't change anything.pull/2670/head
| @@ -9,7 +9,7 @@ | |||||
| {{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-rust-synapse-compress-state-compress-room | {{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-rust-synapse-compress-state-compress-room | ||||
| --user={{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} | --user={{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} | ||||
| --cap-drop=ALL | --cap-drop=ALL | ||||
| --network={{ matrix_docker_network }} | |||||
| --network={{ matrix_synapse_container_network }} | |||||
| --mount type=bind,src={{ matrix_synapse_rust_synapse_compress_state_base_path }},dst=/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 }} | ||||
| {{ matrix_synapse_rust_synapse_compress_state_synapse_compress_state_in_container_path }} -t -o /work/state-compressor.sql | {{ matrix_synapse_rust_synapse_compress_state_synapse_compress_state_in_container_path }} -t -o /work/state-compressor.sql | ||||
| @@ -7,7 +7,7 @@ | |||||
| --mount type=bind,src={{ matrix_synapse_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \ | --mount type=bind,src={{ matrix_synapse_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \ | ||||
| --mount type=bind,src={{ matrix_synapse_ext_s3_storage_provider_data_path }},dst=/data \ | --mount type=bind,src={{ matrix_synapse_ext_s3_storage_provider_data_path }},dst=/data \ | ||||
| --workdir=/data \ | --workdir=/data \ | ||||
| --network={{ matrix_docker_network }} \ | |||||
| --network={{ matrix_synapse_container_network }} \ | |||||
| --entrypoint=/bin/bash \ | --entrypoint=/bin/bash \ | ||||
| {{ matrix_synapse_docker_image_final }} \ | {{ matrix_synapse_docker_image_final }} \ | ||||
| -c 's3_media_upload update-db $UPDATE_DB_DURATION && s3_media_upload --no-progress check-deleted $MEDIA_PATH && s3_media_upload --no-progress upload $MEDIA_PATH $BUCKET --delete --storage-class $STORAGE_CLASS --endpoint-url $ENDPOINT {% if matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled %}--sse-customer-algo $SSE_CUSTOMER_ALGO --sse-customer-key $SSE_CUSTOMER_KEY{% endif %}' | -c 's3_media_upload update-db $UPDATE_DB_DURATION && s3_media_upload --no-progress check-deleted $MEDIA_PATH && s3_media_upload --no-progress upload $MEDIA_PATH $BUCKET --delete --storage-class $STORAGE_CLASS --endpoint-url $ENDPOINT {% if matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled %}--sse-customer-algo $SSE_CUSTOMER_ALGO --sse-customer-key $SSE_CUSTOMER_KEY{% endif %}' | ||||
| @@ -8,6 +8,6 @@ | |||||
| --mount type=bind,src={{ matrix_synapse_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \ | --mount type=bind,src={{ matrix_synapse_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \ | ||||
| --mount type=bind,src={{ matrix_synapse_ext_s3_storage_provider_data_path }},dst=/data \ | --mount type=bind,src={{ matrix_synapse_ext_s3_storage_provider_data_path }},dst=/data \ | ||||
| --workdir=/data \ | --workdir=/data \ | ||||
| --network={{ matrix_docker_network }} \ | |||||
| --network={{ matrix_synapse_container_network }} \ | |||||
| --entrypoint=/bin/bash \ | --entrypoint=/bin/bash \ | ||||
| {{ matrix_synapse_docker_image_final }} | {{ matrix_synapse_docker_image_final }} | ||||
| @@ -22,7 +22,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ | |||||
| --cap-drop=ALL \ | --cap-drop=ALL \ | ||||
| --read-only \ | --read-only \ | ||||
| --tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \ | --tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \ | ||||
| --network={{ matrix_docker_network }} \ | |||||
| --network={{ matrix_synapse_container_network }} \ | |||||
| {% if matrix_synapse_worker_details.port != 0 %} | {% if matrix_synapse_worker_details.port != 0 %} | ||||
| --health-cmd 'curl -fSs http://localhost:{{ matrix_synapse_worker_details.port }}/health || exit 1' \ | --health-cmd 'curl -fSs http://localhost:{{ matrix_synapse_worker_details.port }}/health || exit 1' \ | ||||
| {% else %} | {% else %} | ||||
| @@ -38,7 +38,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ | |||||
| --cap-drop=ALL \ | --cap-drop=ALL \ | ||||
| --read-only \ | --read-only \ | ||||
| --tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \ | --tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \ | ||||
| --network={{ matrix_docker_network }} \ | |||||
| --network={{ matrix_synapse_container_network }} \ | |||||
| {% if matrix_synapse_container_client_api_host_bind_port %} | {% if matrix_synapse_container_client_api_host_bind_port %} | ||||
| -p {{ matrix_synapse_container_client_api_host_bind_port }}:{{ matrix_synapse_container_client_api_port }} \ | -p {{ matrix_synapse_container_client_api_host_bind_port }}:{{ matrix_synapse_container_client_api_port }} \ | ||||
| {% endif %} | {% endif %} | ||||