summary refs log tree commit diff
path: root/.circleci/config.yml
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
commitf094f715cff95a7cebcbd984dbaccf3f1d81615e (patch)
tree0ffd3f4c45b8b50481713e87a226abb7d1cce35e /.circleci/config.yml
parentRemove redundant, failing, test (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-f094f715cff95a7cebcbd984dbaccf3f1d81615e.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
Diffstat (limited to '.circleci/config.yml')
-rw-r--r--.circleci/config.yml26
1 files changed, 26 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 521aca22ef..3cb14793fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,21 @@
 version: 2
 jobs:
+  dockerhubuploadrelease:
+    machine: true
+    steps:
+      - checkout
+      - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:$CIRCLE_TAG .
+      - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+      - run: docker push matrixdotorg/synapse:$CIRCLE_TAG
+  dockerhubuploadlatest:
+    machine: true
+    steps:
+      - checkout
+      - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:$CIRCLE_SHA1 .
+      - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+      - run: docker tag matrixdotorg/synapse:$CIRCLE_SHA1 matrixdotorg/synapse:latest
+      - run: docker push matrixdotorg/synapse:$CIRCLE_SHA1
+      - run: docker push matrixdotorg/synapse:latest
   sytestpy2:
     machine: true
     steps:
@@ -131,3 +147,13 @@ workflows:
           filters:
             branches:
               ignore: /develop|master|release-.*/
+      - dockerhubuploadrelease:
+          filters:
+            tags:
+              only: /^v[0-9].[0-9]+.[0-9]+(.[0-9]+)?/
+            branches:
+              ignore: /.*/
+      - dockerhubuploadlatest:
+          filters:
+            branches:
+              only: master