From b54eadb9e077e0cc034d477cdcf0d0a03055ad03 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 13 Oct 2025 12:24:58 +0300 Subject: [PATCH] Revert "Remove `matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled`" This reverts commit 2b0ea94a72057602eb46336d9da50a68ccf53383. We're going back to s3-storage-provider=v1.5.0 Ref: https://github.com/matrix-org/synapse-s3-storage-provider/pull/134#issuecomment-3396609289 --- roles/custom/matrix-synapse/defaults/main.yml | 4 ++++ roles/custom/matrix-synapse/tasks/validate_config.yml | 2 -- .../templates/synapse/customizations/Dockerfile.j2 | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 6ae334676..578a37731 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -48,6 +48,10 @@ 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 }}" diff --git a/roles/custom/matrix-synapse/tasks/validate_config.yml b/roles/custom/matrix-synapse/tasks/validate_config.yml index 48930962b..94cfecdb6 100644 --- a/roles/custom/matrix-synapse/tasks/validate_config.yml +++ b/roles/custom/matrix-synapse/tasks/validate_config.yml @@ -117,8 +117,6 @@ - {'old': 'matrix_synapse_experimental_features_msc3861_admin_token', 'new': ''} - {'old': 'matrix_synapse_experimental_features_msc3861_account_management_url', 'new': ''} - - {'old': 'matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled', 'new': ''} - - name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml ansible.builtin.fail: msg: >- diff --git a/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 b/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 index acdcb5752..310f2e726 100644 --- a/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 @@ -45,8 +45,12 @@ 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 }}