From d84fe99883ed13f212b9bf5dc72ccc9c8e459ef7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 15 Feb 2022 11:57:17 +0000
Subject: [PATCH 1/2] Docker: remove `VOLUME` directive

---
 changelog.d/11996.docker | 1 +
 docker/Dockerfile        | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 changelog.d/11996.docker

diff --git a/changelog.d/11996.docker b/changelog.d/11996.docker
new file mode 100644
index 000000000000..1b3271457eee
--- /dev/null
+++ b/changelog.d/11996.docker
@@ -0,0 +1 @@
+The docker image no longer automatically creates a temporary volume at `/data`. This is not expected to affect normal usage.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 306f75ae56cc..e4c1c19b86a7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -98,8 +98,6 @@ COPY --from=builder /install /usr/local
 COPY ./docker/start.py /start.py
 COPY ./docker/conf /conf
 
-VOLUME ["/data"]
-
 EXPOSE 8008/tcp 8009/tcp 8448/tcp
 
 ENTRYPOINT ["/start.py"]

From f9f95ef3b59ba71e84880104525445ebdc169d5b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 15 Feb 2022 12:44:05 +0000
Subject: [PATCH 2/2] Rename 11996.docker to 11997.docker

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

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