diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-21 17:33:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 17:33:34 +0100 |
| commit | 597dafb5e8b14fb4e76718dbeb5eb20fad3fa603 (patch) | |
| tree | a482d53e9a0245845ae38ff720b2d9bbf557bd30 | |
| parent | Add a script to generate a clean config file (#4315) (diff) | |
| parent | Fix circleci config for synapse:latest docker upload (diff) | |
| download | synapse-597dafb5e8b14fb4e76718dbeb5eb20fad3fa603.tar.xz | |
Merge pull request #4316 from matrix-org/rav/fix_docker_upload
Fix circleci config for synapse:latest docker upload
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | changelog.d/4316.bugfix | 1 |
2 files changed, 3 insertions, 2 deletions
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 |