@@ -213,7 +213,13 @@ That last command will give you the proper link to visit to ensure that you
213213open the PR against the "release" branch instead of accidentally against
214214"master" (like so many brave souls before you already have).
215215
216- ### 7. Build release candidate rpms and debs
216+ ### 7. Create a PR to update the AUTHORS file for the release
217+
218+ Update the AUTHORS file, by running the ` hack/generate-authors.sh ` on the
219+ release branch. To prevent duplicate entries, you may need to update the
220+ ` .mailmap ` file accordingly.
221+
222+ ### 8. Build release candidate rpms and debs
217223
218224** NOTE** : It will be a lot faster if you pass a different graphdriver with
219225` DOCKER_GRAPHDRIVER ` than ` vfs ` .
@@ -228,7 +234,7 @@ docker run \
228234 hack/make.sh binary build-deb build-rpm
229235```
230236
231- ### 8 . Publish release candidate rpms and debs
237+ ### 9 . Publish release candidate rpms and debs
232238
233239With the rpms and debs you built from the last step you can release them on the
234240same server, or ideally, move them to a dedicated release box via scp into
@@ -252,14 +258,14 @@ docker run --rm -it --privileged \
252258 hack/make.sh release-deb release-rpm sign-repos generate-index-listing
253259```
254260
255- ### 9 . Upload the changed repos to wherever you host
261+ ### 10 . Upload the changed repos to wherever you host
256262
257263For example, above we bind mounted ` /volumes/repos ` as the storage for
258264` DOCKER_RELEASE_DIR ` . In this case ` /volumes/repos/apt ` can be synced with
259265a specific s3 bucket for the apt repo and ` /volumes/repos/yum ` can be synced with
260266a s3 bucket for the yum repo.
261267
262- ### 10 . Publish release candidate binaries
268+ ### 11 . Publish release candidate binaries
263269
264270To run this you will need access to the release credentials. Get them from the
265271Core maintainers.
@@ -281,7 +287,7 @@ docker run \
281287It will run the test suite, build the binaries and upload to the specified bucket,
282288so this is a good time to verify that you're running against ** test** .docker.com.
283289
284- ### 11 . Purge the cache!
290+ ### 12 . Purge the cache!
285291
286292After the binaries are uploaded to test.docker.com and the packages are on
287293apt.dockerproject.org and yum.dockerproject.org, make sure
@@ -315,7 +321,7 @@ We recommend announcing the release candidate on:
315321- The [ docker-maintainers] ( https://groups.google.com/a/dockerproject.org/forum/#!forum/maintainers ) group
316322- Any social media that can bring some attention to the release candidate
317323
318- ### 12 . Iterate on successive release candidates
324+ ### 13 . Iterate on successive release candidates
319325
320326Spend several days along with the community explicitly investing time and
321327resources to try and break Docker in every possible way, documenting any
@@ -365,7 +371,7 @@ git push -f $GITHUBUSER bump_$VERSION
365371Repeat step 6 to tag the code, publish new binaries, announce availability, and
366372get help testing.
367373
368- ### 13 . Finalize the bump branch
374+ ### 14 . Finalize the bump branch
369375
370376When you're happy with the quality of a release candidate, you can move on and
371377create the real thing.
@@ -381,9 +387,9 @@ git commit --amend
381387
382388You will then repeat step 6 to publish the binaries to test
383389
384- ### 14 . Get 2 other maintainers to validate the pull request
390+ ### 15 . Get 2 other maintainers to validate the pull request
385391
386- ### 15 . Build final rpms and debs
392+ ### 16 . Build final rpms and debs
387393
388394``` bash
389395docker build -t docker .
@@ -394,7 +400,7 @@ docker run \
394400 hack/make.sh binary build-deb build-rpm
395401```
396402
397- ### 16 . Publish final rpms and debs
403+ ### 17 . Publish final rpms and debs
398404
399405With the rpms and debs you built from the last step you can release them on the
400406same server, or ideally, move them to a dedicated release box via scp into
@@ -418,14 +424,14 @@ docker run --rm -it --privileged \
418424 hack/make.sh release-deb release-rpm sign-repos generate-index-listing
419425```
420426
421- ### 17 . Upload the changed repos to wherever you host
427+ ### 18 . Upload the changed repos to wherever you host
422428
423429For example, above we bind mounted ` /volumes/repos ` as the storage for
424430` DOCKER_RELEASE_DIR ` . In this case ` /volumes/repos/apt ` can be synced with
425431a specific s3 bucket for the apt repo and ` /volumes/repos/yum ` can be synced with
426432a s3 bucket for the yum repo.
427433
428- ### 18 . Publish final binaries
434+ ### 19 . Publish final binaries
429435
430436Once they're tested and reasonably believed to be working, run against
431437get.docker.com:
@@ -443,9 +449,9 @@ docker run \
443449 hack/release.sh
444450```
445451
446- ### 19 . Purge the cache!
452+ ### 20 . Purge the cache!
447453
448- ### 20 . Apply tag and create release
454+ ### 21 . Apply tag and create release
449455
450456It's very important that we don't make the tag until after the official
451457release is uploaded to get.docker.com!
@@ -464,12 +470,12 @@ You can see examples in this two links:
464470https://github.com/docker/docker/releases/tag/v1.8.0
465471https://github.com/docker/docker/releases/tag/v1.8.0-rc3
466472
467- ### 21 . Go to github to merge the ` bump_$VERSION ` branch into release
473+ ### 22 . Go to github to merge the ` bump_$VERSION ` branch into release
468474
469475Don't forget to push that pretty blue button to delete the leftover
470476branch afterwards!
471477
472- ### 22 . Update the docs branch
478+ ### 23 . Update the docs branch
473479
474480You will need to point the docs branch to the newly created release tag:
475481
@@ -488,7 +494,7 @@ distributed CDN system) is flushed. The `make docs-release` command will do this
488494_ if_ the ` DISTRIBUTION_ID ` is set correctly - this will take at least 15 minutes to run
489495and you can check its progress with the CDN Cloudfront Chrome addon.
490496
491- ### 23 . Create a new pull request to merge your bump commit back into master
497+ ### 24 . Create a new pull request to merge your bump commit back into master
492498
493499``` bash
494500git checkout master
@@ -502,7 +508,7 @@ echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:
502508Again, get two maintainers to validate, then merge, then push that pretty
503509blue button to delete your branch.
504510
505- ### 24 . Rejoice and Evangelize!
511+ ### 25 . Rejoice and Evangelize!
506512
507513Congratulations! You're done.
508514
0 commit comments