From 9d64e4dbd6aac047c12c20198906dff90c234621 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Feb 2021 14:46:22 +0000
Subject: [PATCH] Drop ARMv7 from docker (#9433)

It's proving incredibly hard to build in CircleCI infra.
---
 .circleci/config.yml    | 4 ++--
 CHANGES.md              | 2 ++
 changelog.d/9433.docker | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/9433.docker

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 375a7f7b0..1ac48a71b 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:
diff --git a/CHANGES.md b/CHANGES.md
index 309c34f90..9837710d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 Synapse 1.xx.0 (2021-xx-xx)
 ===========================
 
+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).
+
 Removal warning
 ---------------
 
diff --git a/changelog.d/9433.docker b/changelog.d/9433.docker
new file mode 100644
index 000000000..cbe3a674d
--- /dev/null
+++ b/changelog.d/9433.docker
@@ -0,0 +1 @@
+Drop support for ARMv7 in Docker images.