From d8e63846e23537d534f94df1e4294326964bb780 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Wed, 6 Feb 2019 09:41:54 +0000
Subject: [PATCH] Fix docker upload job to push -py2 images (#4576)

---
 .circleci/config.yml  | 2 ++
 changelog.d/4576.misc | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/4576.misc

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee72ad7a14..137747dae3 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:
diff --git a/changelog.d/4576.misc b/changelog.d/4576.misc
new file mode 100644
index 0000000000..94b1ade2e3
--- /dev/null
+++ b/changelog.d/4576.misc
@@ -0,0 +1 @@
+Fix docker upload job to push -py2 images.