Signed-off-by: Jessica Frazelle <acidburn@docker.com>
| ... | ... |
@@ -214,7 +214,37 @@ docker run \ |
| 214 | 214 |
hack/make.sh binary build-deb build-rpm |
| 215 | 215 |
``` |
| 216 | 216 |
|
| 217 |
-### 8. Publish release candidate binaries |
|
| 217 |
+### 8. Publish release candidate rpms and debs |
|
| 218 |
+ |
|
| 219 |
+With the rpms and debs you built from the last step you can release them on the |
|
| 220 |
+same server, or ideally, move them to a dedicated release box via scp into |
|
| 221 |
+another docker/docker directory in bundles. This next step assumes you have |
|
| 222 |
+a checkout of the docker source code at the same commit you used to build, with |
|
| 223 |
+the artifacts from the last step in `bundles`. |
|
| 224 |
+ |
|
| 225 |
+```bash |
|
| 226 |
+docker build -t docker . |
|
| 227 |
+docker run --rm -it --privileged \ |
|
| 228 |
+ -v /local/path/to/your/repos:/volumes/repos \ |
|
| 229 |
+ -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \ |
|
| 230 |
+ -v $HOME/.gnupg:/root/.gnupg \ |
|
| 231 |
+ -e DOCKER_RELEASE_DIR=/volumes/repos \ |
|
| 232 |
+ -e GPG_PASSPHRASE \ |
|
| 233 |
+ -e KEEPBUNDLE=1 \ |
|
| 234 |
+ docker \ |
|
| 235 |
+ hack/make.sh release-deb release-rpm |
|
| 236 |
+``` |
|
| 237 |
+ |
|
| 238 |
+### 9. Sign the repos with your GPG key |
|
| 239 |
+ |
|
| 240 |
+ |
|
| 241 |
+```bash |
|
| 242 |
+./hack/make/sign-repos |
|
| 243 |
+``` |
|
| 244 |
+ |
|
| 245 |
+### 10. Upload the changed repos to wherever you host |
|
| 246 |
+ |
|
| 247 |
+### 11. Publish release candidate binaries |
|
| 218 | 248 |
|
| 219 | 249 |
To run this you will need access to the release credentials. Get them from the |
| 220 | 250 |
Core maintainers. |
| ... | ... |
@@ -236,6 +266,8 @@ docker run \ |
| 236 | 236 |
It will run the test suite, build the binaries and upload to the specified bucket, |
| 237 | 237 |
so this is a good time to verify that you're running against **test**.docker.com. |
| 238 | 238 |
|
| 239 |
+### 12. Purge the cache! |
|
| 240 |
+ |
|
| 239 | 241 |
After the binaries are uploaded to test.docker.com and the packages are on |
| 240 | 242 |
apt.dockerproject.org and yum.dockerproject.org, make sure |
| 241 | 243 |
they get tested in both Ubuntu and Debian for any obvious installation |
| ... | ... |
@@ -268,7 +300,7 @@ We recommend announcing the release candidate on: |
| 268 | 268 |
- The [docker-maintainers](https://groups.google.com/a/dockerproject.org/forum/#!forum/maintainers) group |
| 269 | 269 |
- Any social media that can bring some attention to the release candidate |
| 270 | 270 |
|
| 271 |
-### 9. Iterate on successive release candidates |
|
| 271 |
+### 13. Iterate on successive release candidates |
|
| 272 | 272 |
|
| 273 | 273 |
Spend several days along with the community explicitly investing time and |
| 274 | 274 |
resources to try and break Docker in every possible way, documenting any |
| ... | ... |
@@ -318,7 +350,7 @@ git push -f $GITHUBUSER bump_$VERSION |
| 318 | 318 |
Repeat step 6 to tag the code, publish new binaries, announce availability, and |
| 319 | 319 |
get help testing. |
| 320 | 320 |
|
| 321 |
-### 10. Finalize the bump branch |
|
| 321 |
+### 14. Finalize the bump branch |
|
| 322 | 322 |
|
| 323 | 323 |
When you're happy with the quality of a release candidate, you can move on and |
| 324 | 324 |
create the real thing. |
| ... | ... |
@@ -334,9 +366,9 @@ git commit --amend |
| 334 | 334 |
|
| 335 | 335 |
You will then repeat step 6 to publish the binaries to test |
| 336 | 336 |
|
| 337 |
-### 11. Get 2 other maintainers to validate the pull request |
|
| 337 |
+### 15. Get 2 other maintainers to validate the pull request |
|
| 338 | 338 |
|
| 339 |
-### 12. Build final rpms and debs |
|
| 339 |
+### 16. Build final rpms and debs |
|
| 340 | 340 |
|
| 341 | 341 |
```bash |
| 342 | 342 |
docker build -t docker . |
| ... | ... |
@@ -347,7 +379,37 @@ docker run \ |
| 347 | 347 |
hack/make.sh binary build-deb build-rpm |
| 348 | 348 |
``` |
| 349 | 349 |
|
| 350 |
-### 13. Publish final binaries |
|
| 350 |
+### 17. Publish final rpms and debs |
|
| 351 |
+ |
|
| 352 |
+With the rpms and debs you built from the last step you can release them on the |
|
| 353 |
+same server, or ideally, move them to a dedicated release box via scp into |
|
| 354 |
+another docker/docker directory in bundles. This next step assumes you have |
|
| 355 |
+a checkout of the docker source code at the same commit you used to build, with |
|
| 356 |
+the artifacts from the last step in `bundles`. |
|
| 357 |
+ |
|
| 358 |
+```bash |
|
| 359 |
+docker build -t docker . |
|
| 360 |
+docker run --rm -it --privileged \ |
|
| 361 |
+ -v /local/path/to/your/repos:/volumes/repos \ |
|
| 362 |
+ -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \ |
|
| 363 |
+ -v $HOME/.gnupg:/root/.gnupg \ |
|
| 364 |
+ -e DOCKER_RELEASE_DIR=/volumes/repos \ |
|
| 365 |
+ -e GPG_PASSPHRASE \ |
|
| 366 |
+ -e KEEPBUNDLE=1 \ |
|
| 367 |
+ docker \ |
|
| 368 |
+ hack/make.sh release-deb release-rpm |
|
| 369 |
+``` |
|
| 370 |
+ |
|
| 371 |
+### 18. Sign the repos with your GPG key |
|
| 372 |
+ |
|
| 373 |
+ |
|
| 374 |
+```bash |
|
| 375 |
+./hack/make/sign-repos |
|
| 376 |
+``` |
|
| 377 |
+ |
|
| 378 |
+### 19. Upload the changed repos to wherever you host |
|
| 379 |
+ |
|
| 380 |
+### 20. Publish final binaries |
|
| 351 | 381 |
|
| 352 | 382 |
Once they're tested and reasonably believed to be working, run against |
| 353 | 383 |
get.docker.com: |
| ... | ... |
@@ -363,7 +425,9 @@ docker run \ |
| 363 | 363 |
hack/release.sh |
| 364 | 364 |
``` |
| 365 | 365 |
|
| 366 |
-### 14. Apply tag and create release |
|
| 366 |
+### 21. Purge the cache! |
|
| 367 |
+ |
|
| 368 |
+### 22. Apply tag and create release |
|
| 367 | 369 |
|
| 368 | 370 |
It's very important that we don't make the tag until after the official |
| 369 | 371 |
release is uploaded to get.docker.com! |
| ... | ... |
@@ -382,12 +446,12 @@ You can see examples in this two links: |
| 382 | 382 |
https://github.com/docker/docker/releases/tag/v1.8.0 |
| 383 | 383 |
https://github.com/docker/docker/releases/tag/v1.8.0-rc3 |
| 384 | 384 |
|
| 385 |
-### 15. Go to github to merge the `bump_$VERSION` branch into release |
|
| 385 |
+### 23. Go to github to merge the `bump_$VERSION` branch into release |
|
| 386 | 386 |
|
| 387 | 387 |
Don't forget to push that pretty blue button to delete the leftover |
| 388 | 388 |
branch afterwards! |
| 389 | 389 |
|
| 390 |
-### 16. Update the docs branch |
|
| 390 |
+### 24. Update the docs branch |
|
| 391 | 391 |
|
| 392 | 392 |
You will need to point the docs branch to the newly created release tag: |
| 393 | 393 |
|
| ... | ... |
@@ -406,7 +470,7 @@ distributed CDN system) is flushed. The `make docs-release` command will do this |
| 406 | 406 |
_if_ the `DISTRIBUTION_ID` is set correctly - this will take at least 15 minutes to run |
| 407 | 407 |
and you can check its progress with the CDN Cloudfront Chrome addon. |
| 408 | 408 |
|
| 409 |
-### 17. Create a new pull request to merge your bump commit back into master |
|
| 409 |
+### 25. Create a new pull request to merge your bump commit back into master |
|
| 410 | 410 |
|
| 411 | 411 |
```bash |
| 412 | 412 |
git checkout master |
| ... | ... |
@@ -420,14 +484,14 @@ echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER: |
| 420 | 420 |
Again, get two maintainers to validate, then merge, then push that pretty |
| 421 | 421 |
blue button to delete your branch. |
| 422 | 422 |
|
| 423 |
-### 18. Update the VERSION files |
|
| 423 |
+### 26. Update the VERSION files |
|
| 424 | 424 |
|
| 425 | 425 |
Now that version X.Y.Z is out, time to start working on the next! Update the |
| 426 | 426 |
content of the `VERSION` file to be the next minor (incrementing Y) and add the |
| 427 | 427 |
`-dev` suffix. For example, after 1.5.0 release, the `VERSION` file gets |
| 428 | 428 |
updated to `1.6.0-dev` (as in "1.6.0 in the making"). |
| 429 | 429 |
|
| 430 |
-### 19. Rejoice and Evangelize! |
|
| 430 |
+### 27. Rejoice and Evangelize! |
|
| 431 | 431 |
|
| 432 | 432 |
Congratulations! You're done. |
| 433 | 433 |
|