diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-08-10 23:42:12 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-08-10 23:42:12 +0100 |
| commit | aa827b6ad76750158ef51e4c26fb27fac30b449d (patch) | |
| tree | c7f8a2d95e632ece961eef0e4f9a629ef9aebd64 | |
| parent | Add an assertion on prev_events in create_new_client_event (#8041) (diff) | |
| parent | Stop uploading -py3 docker images (#8056) (diff) | |
| download | synapse-aa827b6ad76750158ef51e4c26fb27fac30b449d.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | changelog.d/8056.docker | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 98c217dd1d..5bd2ab2b76 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,18 +4,16 @@ jobs: machine: true steps: - checkout - - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 . + - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} . - 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 --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 . + - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest . - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - run: docker push matrixdotorg/synapse:latest - - run: docker push matrixdotorg/synapse:latest-py3 workflows: version: 2 diff --git a/changelog.d/8056.docker b/changelog.d/8056.docker new file mode 100644 index 0000000000..d56734c13a --- /dev/null +++ b/changelog.d/8056.docker @@ -0,0 +1 @@ +We no longer publish Docker images with the `-py3` tag suffix, as announced at https://github.com/matrix-org/synapse/blob/develop/UPGRADE.rst#upgrading-to-v1180. |