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

Remove `matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled`

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4637

We no longer need to boto workaround since s3-storage-provider got
upgraded to v1.6.0 in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/4635
pull/4639/head
Slavi Pantaleev 4 месяцев назад
Родитель
Сommit
2b0ea94a72
3 измененных файлов: 2 добавлений и 8 удалений
  1. +0
    -4
      roles/custom/matrix-synapse/defaults/main.yml
  2. +2
    -0
      roles/custom/matrix-synapse/tasks/validate_config.yml
  3. +0
    -4
      roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2

+ 0
- 4
roles/custom/matrix-synapse/defaults/main.yml Просмотреть файл

@@ -48,10 +48,6 @@ matrix_synapse_container_image_customizations_enabled: |-
# The version that will be installed is specified in `matrix_synapse_ext_synapse_s3_storage_provider_version`.
matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled: "{{ matrix_synapse_ext_synapse_s3_storage_provider_enabled }}"

# Controls whether to install an old version of boto3 and botocore, to work around the following issue:
# https://github.com/aws/aws-cli/issues/9214
matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled: true

# Controls whether custom build steps will be added to the Dockerfile for installing auto-accept-invite module.
# The version that will be installed is specified in `matrix_synapse_ext_synapse_auto_accept_invite_version`.
matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled: "{{ matrix_synapse_ext_synapse_auto_accept_invite_enabled }}"


+ 2
- 0
roles/custom/matrix-synapse/tasks/validate_config.yml Просмотреть файл

@@ -117,6 +117,8 @@
- {'old': 'matrix_synapse_experimental_features_msc3861_admin_token', 'new': '<removed>'}
- {'old': 'matrix_synapse_experimental_features_msc3861_account_management_url', 'new': '<removed>'}

- {'old': 'matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled', 'new': '<removed; see https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4637>'}

- name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
ansible.builtin.fail:
msg: >-


+ 0
- 4
roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 Просмотреть файл

@@ -45,12 +45,8 @@ RUN pip install synapse-auto-accept-invite=={{ matrix_synapse_ext_synapse_auto_a
{% endif %}

{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled %}
{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled %}
RUN pip install 'boto3<1.36.0' 'botocore<1.36.0' synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
{% else %}
RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
{% endif %}
{% endif %}

{% if matrix_synapse_container_image_customizations_templates_enabled %}
COPY --from=templates-builder {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }} {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }}


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