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/docker/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:
export GITHUBUSER="YOUR_GITHUB_USER" git remote add origin https://github.com/docker/docker.git git remote add $GITHUBUSER git@github.com:$GITHUBUSER/docker.git
All releases version numbers will be of the form: vX.Y.Z where X is the major version number, Y is the minor version number and Z is the patch release version number.
The release branch name is just vX.Y because it's going to be the basis for all .Z releases.
export BASE=vX.Y export VERSION=vX.Y.Z git fetch origin git checkout --track origin/master git checkout -b release/$BASE
This new branch is going to be the base for the release. We need to push it to origin so we can track the cherry-picked changes and the version bump:
git push origin release/$BASE
When you have the major release branch in origin, we need to create the bump fork branch that we'll push to our fork:
git checkout -b bump_$VERSION
If we have the release branch in origin, we can create the forked bump branch from it directly:
export VERSION=vX.Y.Z export PATCH=vX.Y.Z+1 git fetch origin git checkout --track origin/release/$BASE git checkout -b bump_$PATCH
We cherry-pick only the commits we want into the bump branch:
# get the commits ids we want to cherry-pick git log # cherry-pick the commits starting from the oldest one, without including merge commits git cherry-pick <commit-id> git cherry-pick <commit-id> ...
We don‘t want to stop contributions to master just because we are releasing. At the same time, now that the release branch exists, we don’t want API changes to go to the now frozen API version.
Create a new entry in docs/reference/api/ by copying the latest and bumping the version number (in both the file's name and content), and submit this in a PR against master.
You can run this command for reference with git 2.0:
git fetch --tags LAST_VERSION=$(git tag -l --sort=-version:refname "v*" | grep -E 'v[0-9\.]+$' | head -1) git log --stat $LAST_VERSION..bump_$VERSION
If you don't have git 2.0 but have a sort command that supports -V:
git fetch --tags LAST_VERSION=$(git tag -l | grep -E 'v[0-9\.]+$' | sort -rV | head -1) git log --stat $LAST_VERSION..bump_$VERSION
If releasing a major version (X or Y increased in vX.Y.Z), simply listing notable user-facing features is sufficient.
#### Notable features since <last major version> * New docker command to do something useful * Remote API change (deprecating old version) * Performance improvements in some usecases * ...
For minor releases (only Z increases in vX.Y.Z), provide a list of user-facing changes. 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 image #### 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.
Before the big thing, you'll want to make successive release candidates and get people to test. The release candidate number N should be part of the version:
export RC_VERSION=${VERSION}-rcN echo ${RC_VERSION#v} > VERSION
Make sure that your tree includes documentation for any modified or new features, syntax or semantic changes.
To test locally:
make docs
To make a shared test at https://beta-docs.docker.io:
(You will need the awsconfig file added to the docs/ dir)
make AWS_S3_BUCKET=beta-docs.docker.io BUILD_ROOT=yes docs-release
git add VERSION CHANGELOG.md git commit -m "Bump version to $VERSION" git push $GITHUBUSER bump_$VERSION echo "https://github.com/$GITHUBUSER/docker/compare/docker:release/$BASE...$GITHUBUSER:bump_$VERSION?expand=1"
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).
docker build -t docker . docker run \ --rm -t --privileged \ -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \ docker \ hack/make.sh binary build-deb build-rpm
To run this you will need access to the release credentials. Get them from the Core maintainers.
Replace “...” with the respective credentials:
docker build -t docker . docker run \ -e AWS_S3_BUCKET=test.docker.com \ # static binaries are still pushed to s3 -e AWS_ACCESS_KEY="..." \ -e AWS_SECRET_KEY="..." \ -i -t --privileged \ docker \ hack/release.sh
It will run the test suite, build the binaries and upload to the specified bucket, so this is a good time to verify that you're running against test.docker.com.
After the binaries are uploaded to test.docker.com and the packages are on apt.dockerproject.org and yum.dockerproject.org, make sure they get tested in both Ubuntu and Debian for any obvious installation issues or runtime issues.
If everything looks good, it's time to create a git tag for this candidate:
git tag -a $RC_VERSION -m $RC_VERSION bump_$VERSION git push origin $RC_VERSION
Announcing on multiple medias is the best way to get some help testing! An easy way to get some useful links for sharing:
echo "Ubuntu/Debian: curl -sSL https://test.docker.com/ | sh" echo "Linux 64bit binary: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}" echo "Darwin/OSX 64bit client binary: https://test.docker.com/builds/Darwin/x86_64/docker-${VERSION#v}" echo "Linux 64bit tgz: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}.tgz" echo "Windows 64bit client binary: https://test.docker.com/builds/Windows/x86_64/docker-${VERSION#v}.exe" echo "Windows 32bit client binary: https://test.docker.com/builds/Windows/i386/docker-${VERSION#v}.exe"
We recommend announcing the release candidate on:
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.
During this phase, the bump_$VERSION branch will keep evolving as you will produce new release candidates. The frequency of new candidates is up to the release manager: use your best judgement taking into account the severity of reported issues, testers availability, and time to scheduled release date.
Each time you'll want to produce a new release candidate, you will start by adding commits to the branch, usually by cherry-picking from master:
git cherry-pick -x -m0 <commit_id>
You want your “bump commit” (the one that updates the CHANGELOG and VERSION files) to remain on top, so you'll have to git rebase -i to bring it back up.
Now that your bump commit is back on top, you will need to update the CHANGELOG file (if appropriate for this particular release candidate), and update the VERSION file to increment the RC number:
export RC_VERSION=$VERSION-rcN echo $RC_VERSION > VERSION
You can now amend your last commit and update the bump branch:
git commit --amend git push -f $GITHUBUSER bump_$VERSION
Repeat step 6 to tag the code, publish new binaries, announce availability, and get help testing.
When you're happy with the quality of a release candidate, you can move on and create the real thing.
You will first have to amend the “bump commit” to drop the release candidate suffix in the VERSION file:
echo $VERSION > VERSION git add VERSION git commit --amend
You will then repeat step 6 to publish the binaries to test
docker build -t docker . docker run \ --rm -t --privileged \ -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \ docker \ hack/make.sh binary build-deb build-rpm
Once they're tested and reasonably believed to be working, run against get.docker.com:
docker build -t docker . docker run \ -e AWS_S3_BUCKET=get.docker.com \ # static binaries are still pushed to s3 -e AWS_ACCESS_KEY="..." \ -e AWS_SECRET_KEY="..." \ -i -t --privileged \ docker \ hack/release.sh
It‘s very important that we don’t make the tag until after the official release is uploaded to get.docker.com!
git tag -a $VERSION -m $VERSION bump_$VERSION git push origin $VERSION
Once the tag is pushed, go to GitHub and create a new release. If the tag is for an RC make sure you check This is a pre-release at the bottom of the form.
Select the tag that you just pushed as the version and paste the changelog in the description of the release. You can see examples in this two links:
https://github.com/docker/docker/releases/tag/v1.8.0 https://github.com/docker/docker/releases/tag/v1.8.0-rc3
bump_$VERSION branch into releaseDon't forget to push that pretty blue button to delete the leftover branch afterwards!
You will need to point the docs branch to the newly created release tag:
git checkout origin/docs git reset --hard origin/$VERSION git push -f origin docs
The docs will appear on https://docs.docker.com/ (though there may be cached versions, so its worth checking http://docs.docker.com.s3-website-us-east-1.amazonaws.com/). For more information about documentation releases, see docs/README.md.
Note that the new docs will not appear live on the site until the cache (a complex, distributed CDN system) is flushed. The make docs-release command will do this if the DISTRIBUTION_ID is set correctly - this will take at least 15 minutes to run and you can check its progress with the CDN Cloudfront Chrome addon.
git checkout master git fetch git reset --hard origin/master git cherry-pick $VERSION git push $GITHUBUSER merge_release_$VERSION echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:merge_release_$VERSION?expand=1"
Again, get two maintainers to validate, then merge, then push that pretty blue button to delete your branch.
Now that version X.Y.Z is out, time to start working on the next! Update the content of the VERSION file to be the next minor (incrementing Y) and add the -dev suffix. For example, after 1.5.0 release, the VERSION file gets updated to 1.6.0-dev (as in “1.6.0 in the making”).
Congratulations! You're done.
Go forth and announce the glad tidings of the new release in #docker, #docker-dev, on the dev mailing list, the announce mailing list, and on Twitter!