2015-08-12 17:31:37 +02:00
Building a Compose release
==========================
2015-07-01 16:57:27 +02:00
2015-08-12 17:31:37 +02:00
## To get started with a new release
2015-07-01 16:57:27 +02:00
2015-09-11 07:44:25 +02:00
Create a branch, update version, and add release notes by running `make-branch`
2015-07-01 16:57:27 +02:00
2015-09-11 08:02:01 +02:00
./script/release/make-branch $VERSION [$BASE_VERSION]
2015-07-01 16:57:27 +02:00
2015-09-22 16:10:11 +02:00
`$BASE_VERSION` will default to master. Use the last version tag for a bug fix
2015-09-11 07:44:25 +02:00
release.
2015-07-01 16:57:27 +02:00
2015-09-11 08:02:01 +02:00
As part of this script you'll be asked to:
2015-07-01 16:57:27 +02:00
2015-09-11 08:02:01 +02:00
1. Update the version in `docs/install.md` and `compose/__init__.py` .
2015-07-01 16:57:27 +02:00
2015-08-12 17:31:37 +02:00
If the next release will be an RC, append `rcN` , e.g. `1.4.0rc1` .
2015-07-01 16:57:27 +02:00
2015-09-11 08:02:01 +02:00
2. Write release notes in `CHANGES.md` .
2015-07-01 16:57:27 +02:00
2015-08-25 15:26:33 +02:00
Almost every feature enhancement should be mentioned, with the most visible/exciting ones first. Use descriptive sentences and give context where appropriate.
Bug fixes are worth mentioning if it's likely that they've affected lots of people, or if they were regressions in the previous version.
Improvements to the code are not worth mentioning.
2015-08-12 17:31:37 +02:00
## When a PR is merged into master that we want in the release
2015-09-11 08:02:01 +02:00
1. Check out the bump branch and run the cherry pick script
2015-08-12 17:31:37 +02:00
git checkout bump-$VERSION
2015-09-11 08:02:01 +02:00
./script/release/cherry-pick-pr $PR_NUMBER
2015-08-12 17:31:37 +02:00
2015-09-11 08:02:01 +02:00
2. When you are done cherry-picking branches move the bump version commit to HEAD
2015-08-12 17:31:37 +02:00
2015-09-11 08:02:01 +02:00
./script/release/rebase-bump-commit
2015-08-12 17:31:37 +02:00
git push --force $USERNAME bump-$VERSION
2015-09-11 08:02:01 +02:00
2015-08-12 17:31:37 +02:00
## To release a version (whether RC or stable)
2015-09-22 16:10:11 +02:00
Check out the bump branch and run the `build-binary` script
2015-08-12 17:31:37 +02:00
git checkout bump-$VERSION
2015-09-22 16:10:11 +02:00
./script/release/build-binary
2015-08-12 17:31:37 +02:00
2015-10-02 17:25:16 +02:00
When prompted build the non-linux binaries and test them.
2015-08-12 17:31:37 +02:00
2015-10-02 17:25:16 +02:00
1. Build the Mac binary in a Mountain Lion VM:
2015-08-12 17:31:37 +02:00
2015-10-02 17:25:16 +02:00
script/prepare-osx
script/build-osx
2. Download the windows binary from AppVeyor
2015-10-14 21:16:58 +02:00
https://ci.appveyor.com/project/docker/compose
2015-10-02 17:25:16 +02:00
3. Draft a release from the tag on GitHub (the script will open the window for
2015-09-11 07:44:25 +02:00
you)
2015-08-12 17:31:37 +02:00
2015-09-11 07:44:25 +02:00
In the "Tag version" dropdown, select the tag you just pushed.
2015-08-25 15:26:33 +02:00
2015-10-02 17:25:16 +02:00
4. Paste in installation instructions and release notes. Here's an example - change the Compose version and Docker version as appropriate:
2015-08-25 15:26:33 +02:00
Firstly, note that Compose 1.5.0 requires Docker 1.8.0 or later.
2015-08-27 11:36:12 +02:00
Secondly, if you're a Mac user, the ** [Docker Toolbox ](https://www.docker.com/toolbox )** will install Compose 1.5.0 for you, alongside the latest versions of the Docker Engine, Machine and Kitematic.
2015-08-25 15:26:33 +02:00
Otherwise, you can use the usual commands to install/upgrade. Either download the binary:
curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
Or install the PyPi package:
pip install -U docker-compose==1.5.0
Here's what's new:
2015-08-12 17:31:37 +02:00
2015-08-25 15:26:33 +02:00
...release notes go here...
2015-08-12 17:31:37 +02:00
2015-10-06 21:18:58 +02:00
5. Attach the binaries and `script/run.sh`
2015-08-12 17:31:37 +02:00
2015-10-14 21:14:04 +02:00
6. Add "Thanks" with a list of contributors. The contributor list can be generated
by running `./script/release/contributors` .
7. If everything looks good, it's time to push the release.
2015-09-22 16:10:11 +02:00
./script/release/push-release
2015-10-14 21:14:04 +02:00
8. Publish the release on GitHub.
2015-08-12 17:31:37 +02:00
2015-10-14 21:16:58 +02:00
9. Check that all the binaries download (following the install instructions) and run.
2015-08-12 17:31:37 +02:00
2015-10-14 21:14:04 +02:00
10. Email maintainers@dockerproject.org and engineering@docker.com about the new release.
2015-08-12 17:31:37 +02:00
## If it’ s a stable release (not an RC)
1. Merge the bump PR.
2. Make sure `origin/release` is updated locally:
git fetch origin
3. Update the `docs` branch on the upstream repo:
git push git@github.com:docker/compose.git origin/release:docs
4. Let the docs team know that it’ s been updated so they can publish it.
5. Close the release’ s milestone.
## If it’ s a minor release (1.x.0), rather than a patch release (1.x.y)
1. Open a PR against `master` to:
- update `CHANGELOG.md` to bring it in line with `release`
- bump the version in `compose/__init__.py` to the *next* minor version number with `dev` appended. For example, if you just released `1.4.0` , update it to `1.5.0dev` .
2. Get the PR merged.
## Finally
1. Celebrate, however you’ d like.