diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-12-21 00:20:22 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-12-21 00:22:31 +0000 |
commit | d9aaf26539815fc344f447b8df98d5e902cf708f (patch) | |
tree | 0b2d2ff4397353961faa764d52d54344543a06df | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-d9aaf26539815fc344f447b8df98d5e902cf708f.tar.xz |
Fix circleci config for synapse:latest docker upload
Give the image the right tag, so that we can push it.
-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 |