From 7eb4cc987fb0f6398b5b08f3037f0ad8582dd22f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Feb 2021 14:01:31 +0000
Subject: [PATCH 1/4] Drop ARMv7 from docker

It's proving incredibly hard to build in CircleCI infra.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 375a7f7b043c..1ac48a71bace 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           platforms: linux/amd64
       - docker_build:
           tag: -t matrixdotorg/synapse:${CIRCLE_TAG}
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
 
   dockerhubuploadlatest:
     docker:
@@ -27,7 +27,7 @@ jobs:
       # until all of the platforms are built.
       - docker_build:
           tag: -t matrixdotorg/synapse:latest
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
 
 workflows:
   build:

From be431b7c042563f1587a4f77139c4bc73aa3e778 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Feb 2021 14:03:01 +0000
Subject: [PATCH 2/4] Newsfile

---
 changelog.d/9433.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/9433.misc

diff --git a/changelog.d/9433.misc b/changelog.d/9433.misc
new file mode 100644
index 000000000000..cbe3a674d38b
--- /dev/null
+++ b/changelog.d/9433.misc
@@ -0,0 +1 @@
+Drop support for ARMv7 in Docker images.

From e2392d23a4f20275fa7acf4979f38807a27c05e6 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Feb 2021 14:04:24 +0000
Subject: [PATCH 3/4] Newsfile2

---
 changelog.d/{9433.misc => 9433.docker} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{9433.misc => 9433.docker} (100%)

diff --git a/changelog.d/9433.misc b/changelog.d/9433.docker
similarity index 100%
rename from changelog.d/9433.misc
rename to changelog.d/9433.docker

From 9d6d3f115df7a70bf5dd5aeb749cde71abf46407 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Feb 2021 14:12:48 +0000
Subject: [PATCH 4/4] Add note to CHANGES

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d9afcaa52b7f..f3cfc77e7bc4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+Next release
+============
+
+Note that this release drops support for ARMv7 in the official Docker images, due to repeated problems building for ARMv7 (and the associated maintenance burden this entails).
+
 Synapse 1.27.0 (2021-02-16)
 ===========================