From d9aaf26539815fc344f447b8df98d5e902cf708f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 21 Dec 2018 00:20:22 +0000
Subject: [PATCH] Fix circleci config for synapse:latest docker upload

Give the image the right tag, so that we can push it.
---
 .circleci/config.yml    | 4 ++--
 changelog.d/4316.bugfix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/4316.bugfix

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4aafd4b2c..697e6c577f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,8 +13,8 @@ jobs:
     machine: true
     steps:
       - checkout
-      - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_SHA1} .
-      - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_SHA1}-py3 --build-arg PYTHON_VERSION=3.6 .
+      - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest .
+      - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -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-py3
diff --git a/changelog.d/4316.bugfix b/changelog.d/4316.bugfix
new file mode 100644
index 0000000000..bd152dc371
--- /dev/null
+++ b/changelog.d/4316.bugfix
@@ -0,0 +1 @@
+Fix synapse:latest docker upload
-- 
GitLab