Просмотр исходного кода

Connect to s3-storage-provider shell to multiple networks in multiple steps

The previous commit actually fixed the `migrate` script.
This one fixes `shell`.
pull/3136/head
Slavi Pantaleev 2 лет назад
committed by GitHub
Родитель
Сommit
8874e9d06d
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: B5690EEEBB952194
1 измененных файлов: 13 добавлений и 3 удалений
  1. +13
    -3
      roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/bin/shell.j2

+ 13
- 3
roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/bin/shell.j2 Просмотреть файл

@@ -1,14 +1,24 @@
#jinja2: lstrip_blocks: "True"
#!/bin/bash
set -euo pipefail

{{ devture_systemd_docker_base_host_command_docker }} run \
container_id=$(\
{{ devture_systemd_docker_base_host_command_docker }} create \
-it \
--rm \
--name=matrix-synapse-s3-storage-provider-shell \
--env-file={{ matrix_synapse_ext_s3_storage_provider_base_path }}/env \
--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 \
--workdir=/data \
--network={{ matrix_synapse_container_network }} \
--network={{ devture_postgres_container_network }} \
--entrypoint=/bin/bash \
{{ matrix_synapse_docker_image_final }}
{{ matrix_synapse_docker_image_final }} \
)

{# We need to connect to the Postgres network, which should be in this list. #}
{% for network in matrix_synapse_container_additional_networks %}
{{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} $container_id
{% endfor %}

{{ devture_systemd_docker_base_host_command_docker }} start --attach -i $container_id

Загрузка…
Отмена
Сохранить