So you‘re in charge of a Docker release? Cool. Here’s what to do.
If your experience deviates from this document, please document the changes to keep it up-to-date.
It is important to note that this document assumes that the git remote in your repository that corresponds to “https://github.com/dotcloud/docker” is named “origin”. If yours is not (for example, if you've chosen to name it “upstream” or something similar instead), be sure to adjust the listed snippets for your local environment accordingly. If you are not sure what your upstream remote is named, use a command like git remote -v to find out.
If you don't have an upstream remote, you can add one easily using something like:
git remote add origin https://github.com/dotcloud/docker.git git remote add YOURUSER git@github.com:YOURUSER/docker.git
export VERSION=vX.Y.Z git checkout release git fetch git reset --hard origin/release git checkout -b bump_$VERSION git merge origin/master
You can run this command for reference:
LAST_VERSION=$(git tag | grep -E 'v[0-9\.]+$' | sort -nr | head -n 1) git log --stat $LAST_VERSION..HEAD
Each change should be listed under a category heading formatted as #### CATEGORY.
CATEGORY should describe which part of the project is affected. Valid categories are:
Each change should be formatted as BULLET DESCRIPTION, given:
BULLET: either -, + or *, to indicate a bugfix, new feature or upgrade, respectively.
DESCRIPTION: a concise description of the change that is relevant to the end-user, using the present tense. Changes should be described in terms of how they affect the user, for example “Add new feature X which allows Y”, “Fix bug which caused X”, “Increase performance of Y”.
EXAMPLES:
## 0.3.6 (1995-12-25) #### Builder + 'docker build -t FOO .' applies the tag FOO to the newly built container #### Remote API - Fix a bug in the optional unix socket transport #### Runtime * Improve detection of kernel version
If you need a list of contributors between the last major release and the current bump branch, use something like:
git log --format='%aN <%aE>' v0.7.0...bump_v0.8.0 | sort -uf
Obviously, you'll need to adjust version numbers as necessary. If you just need a count, add a simple | wc -l.
echo ${VERSION#v} > VERSION
make test
Make sure that your tree includes documentation for any modified or new features, syntax or semantic changes. Instructions for building the docs are in docs/README.md.
git add VERSION CHANGELOG.md git commit -m "Bump version to $VERSION" git push origin bump_$VERSION echo "https://github.com/dotcloud/docker/compare/release...bump_$VERSION"
That last command will give you the proper link to visit to ensure that you open the PR against the “release” branch instead of accidentally against “master” (like so many brave souls before you already have).
To run this you will need access to the release credentials. Get them from the infrastructure maintainers.
docker build -t docker . export AWS_S3_BUCKET="test.docker.io" export AWS_ACCESS_KEY="$(cat ~/.aws/access_key)" export AWS_SECRET_KEY="$(cat ~/.aws/secret_key)" export GPG_PASSPHRASE=supersecretsesame docker run \ -e AWS_S3_BUCKET=test.docker.io \ -e AWS_ACCESS_KEY \ -e AWS_SECRET_KEY \ -e GPG_PASSPHRASE \ -i -t --privileged \ docker \ hack/release.sh
It will run the test suite one more time, build the binaries and packages, and upload to the specified bucket (you should use test.docker.io for general testing, and once everything is fine, switch to get.docker.io as noted below).
After the binaries and packages are uploaded to test.docker.io, make sure they get tested in both Ubuntu and Debian for any obvious installation issues or runtime issues.
Announcing on IRC in both #docker and #docker-dev is a great way to get help testing! An easy way to get some useful links for sharing:
echo "Ubuntu/Debian install script: curl -sLS https://test.docker.io/ | sh" echo "Linux 64bit binary: https://test.docker.io/builds/Linux/x86_64/docker-${VERSION#v}" echo "Darwin/OSX 64bit client binary: https://test.docker.io/builds/Darwin/x86_64/docker-${VERSION#v}" echo "Darwin/OSX 32bit client binary: https://test.docker.io/builds/Darwin/i386/docker-${VERSION#v}" echo "Linux 64bit tgz: https://test.docker.io/builds/Linux/x86_64/docker-${VERSION#v}.tgz"
Once they're tested and reasonably believed to be working, run against get.docker.io:
docker run \ -e AWS_S3_BUCKET=get.docker.io \ -e AWS_ACCESS_KEY \ -e AWS_SECRET_KEY \ -e GPG_PASSPHRASE \ -i -t --privileged \ docker \ hack/release.sh
Spend several days along with the community explicitly investing time and resources to try and break Docker in every possible way, documenting any findings pertinent to the release. This time should be spent testing and finding ways in which the release might have caused various features or upgrade environments to have issues, not coding. During this time, the release is in code freeze, and any additional code changes will be pushed out to the next release.
It should include various levels of breaking Docker, beyond just using Docker by the book.
Any issues found may still remain issues for this release, but they should be documented and give appropriate warnings.
git tag -a $VERSION -m $VERSION bump_$VERSION git push origin $VERSION
It‘s very important that we don’t make the tag until after the official release is uploaded to get.docker.io!
bump_$VERSION branch into releaseDon't forget to push that pretty blue button to delete the leftover branch afterwards!
git checkout docs git fetch git reset --hard origin/release git push -f origin docs
Updating the docs branch will automatically update the documentation on the “latest” revision of the docs. You should see the updated docs 5-10 minutes after the merge. The docs will appear on http://docs.docker.io/. For more information about documentation releases, see docs/README.md.
git checkout master git fetch git reset --hard origin/master git merge origin/release git checkout -b merge_release_$VERSION echo ${VERSION#v}-dev > VERSION git add VERSION git commit -m "Change version to $(cat VERSION)" git push origin merge_release_$VERSION echo "https://github.com/dotcloud/docker/compare/master...merge_release_$VERSION"
Again, get two maintainers to validate, then merge, then push that pretty blue button to delete your branch.
Congratulations! You're done.
Go forth and announce the glad tidings of the new release in #docker, #docker-dev, on the mailing list, and on Twitter!