From cf02d0d1d70fa26b415d30c792cbf1a3f44e90be Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Thu, 17 Sep 2026 10:09:17 -0500
Subject: [PATCH] Align comments in `.dockerignore` with `synapse-private`
 `pro` branch (#20224)

See https://github.com/element-hq/synapse-private/blob/pro/.dockerignore

Spawning from https://github.com/element-hq/synapse-private/issues/169
where because we now have 'Synapse Variants' builds for the Synapse Pro
container images, we can revert our special `docker/` changes back to
match this repo. In this case, the new comments here make some sense so
let's keep it :fast_forward:
---
 .dockerignore          | 3 ++-
 changelog.d/20224.misc | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/20224.misc

diff --git a/.dockerignore b/.dockerignore
index 0b51345cbd..7b09e18b43 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,7 @@
 # ignore everything by default
 *
 
-# things to include
+# Things to include
 !docker
 !synapse
 !rust
@@ -12,6 +12,7 @@
 !Cargo.toml
 !build_rust.py
 
+# Things to re-ignore
 rust/target
 synapse/*.so
 
diff --git a/changelog.d/20224.misc b/changelog.d/20224.misc
new file mode 100644
index 0000000000..829f713cf6
--- /dev/null
+++ b/changelog.d/20224.misc
@@ -0,0 +1 @@
+Align comments in `.dockerignore` with what we have in the private Synapse Pro branch.