diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
| commit | e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9 (patch) | |
| tree | 2ef1ecdb2f2c6641a81a47adf51fda62343be7e3 /.circleci/config.yml | |
| parent | Remove debugging statement (diff) | |
| parent | Make workers work on Py3 (#4027) (diff) | |
| download | synapse-e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9.tar.xz | |
Merge branch 'develop' into travis/fix-federated-group-requests
Diffstat (limited to '.circleci/config.yml')
| -rw-r--r-- | .circleci/config.yml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 521aca22ef..ec3848b048 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,27 @@ version: 2 jobs: + dockerhubuploadrelease: + machine: true + steps: + - checkout + - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:${CIRCLE_TAG} . + - run: docker build -f docker/Dockerfile -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}-py3 + dockerhubuploadlatest: + machine: true + steps: + - checkout + - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:${CIRCLE_SHA1} . + - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:${CIRCLE_SHA1}-py3 --build-arg PYTHON_VERSION=3.6 . + - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD + - run: docker tag matrixdotorg/synapse:${CIRCLE_SHA1} matrixdotorg/synapse:latest + - run: docker tag matrixdotorg/synapse:${CIRCLE_SHA1}-py3 matrixdotorg/synapse:latest-py3 + - run: docker push matrixdotorg/synapse:${CIRCLE_SHA1} + - run: docker push matrixdotorg/synapse:${CIRCLE_SHA1}-py3 + - run: docker push matrixdotorg/synapse:latest + - run: docker push matrixdotorg/synapse:latest-py3 sytestpy2: machine: true steps: @@ -131,3 +153,13 @@ workflows: filters: branches: ignore: /develop|master|release-.*/ + - dockerhubuploadrelease: + filters: + tags: + only: /v[0-9].[0-9]+.[0-9]+.*/ + branches: + ignore: /.*/ + - dockerhubuploadlatest: + filters: + branches: + only: master |