From ec0d843f579deef7b958dc0fe37b9299df9254a2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 6 Feb 2019 07:24:07 +0000
Subject: [PATCH 1/3] Fix failure to push -py2 docker build

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee72ad7a14d1..137747dae3f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,6 +8,7 @@ jobs:
       - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 --build-arg PYTHON_VERSION=3.6 .
       - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
       - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}
+      - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py2
       - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py3
   dockerhubuploadlatest:
     machine: true
@@ -17,6 +18,7 @@ jobs:
       - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 --build-arg PYTHON_VERSION=3.6 .
       - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
       - run: docker push matrixdotorg/synapse:latest
+      - run: docker push matrixdotorg/synapse:latest-py2
       - run: docker push matrixdotorg/synapse:latest-py3
   sytestpy2:
     docker:

From 8886f19065c838c120fb253bab76a66c29bc0e43 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 6 Feb 2019 07:25:25 +0000
Subject: [PATCH 2/3] changelog

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

diff --git a/changelog.d/4576.misc b/changelog.d/4576.misc
new file mode 100644
index 000000000000..d3fde70ae0cd
--- /dev/null
+++ b/changelog.d/4576.misc
@@ -0,0 +1 @@
+Fix docker upload job to push -py2 images

From 361954741783c798c47023260560b1b4f1bd696d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Wed, 6 Feb 2019 09:39:56 +0000
Subject: [PATCH 3/3] Update 4576.misc

---
 changelog.d/4576.misc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/4576.misc b/changelog.d/4576.misc
index d3fde70ae0cd..94b1ade2e387 100644
--- a/changelog.d/4576.misc
+++ b/changelog.d/4576.misc
@@ -1 +1 @@
-Fix docker upload job to push -py2 images
+Fix docker upload job to push -py2 images.