diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-06 09:50:54 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-06 09:50:54 +0000 |
| commit | 7fe407a87a4e6fa0825487b03afe65173e2a66ad (patch) | |
| tree | 9fcabd09ab1c15d70a7631b2df51ef2d8e97d8f1 | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Fix docker upload job to push -py2 images (#4576) (diff) | |
| download | synapse-7fe407a87a4e6fa0825487b03afe65173e2a66ad.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | changelog.d/4576.misc | 1 |
2 files changed, 3 insertions, 0 deletions
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. |