diff --git a/CHANGELOG.md b/CHANGELOG.md index 753aeb9..21562e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.2.0 + + * [dependencies] Bump twisted from 19.2.1 to 19.7.0 (#8) + * Update releasing instructions in `README.md` and `CONTRIBUTING.md` + # 1.1.0 * [security] Rebuild image using latest upstream python:3.7-alpine tag to fix CVE-2019-5021 (#7) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eedb57c..f96f381 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,8 +39,10 @@ the full set of tests run by our build system. ## Releasing -Once a pull request has been merged, the commit in master should be tagged with a new version number and pushed. -Only maintainers are able to do this. +As a project maintainer you will need to release this project to push a new Docker image to Docker Hub, e.g. once a pull request has been merged. + +Create a release in GitHub, with the contents of the Changelog for that release version. This will create a tag, for +which Travis will build and publish an image. This project follows the [Semantic Versioning](https://semver.org/) specification, and version numbers should be chosen accordingly. diff --git a/README.md b/README.md index 5079834..257f974 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,4 @@ Please see our [Contributing guidelines](/CONTRIBUTING.md) for more information. ## Releasing -As a project maintainer, you will need to release this project to push a new Docker image to Docker Hub. - -Create a release in GitHub, with the contents of the Changelog for that release version. This will create a tag, for -which Travis will build and publish an image. +See instructions in eponymous section in `CONTRIBUTING.md`