Merge pull request moby#2255 from dotcloud/bump_0.6.4

Bump to 0.6.4

.mailmap

@@ -26,3 +26,15 @@ Roberto Hashioka <[email protected]>
 Konstantin Pelykh <[email protected]>
 David Sissitka <[email protected]>
 Nolan Darilek <[email protected]>
+<[email protected]> <[email protected]>
+Benoit Chesneau <[email protected]>
+Jordan Arentsen <[email protected]>
+Daniel Garcia <[email protected]>
+Miguel Angel Fernández <[email protected]>
+Bhiraj Butala <[email protected]>
+Faiz Khan <[email protected]>
+Victor Lyuboslavsky <[email protected]>
+Jean-Baptiste Barth <[email protected]>
+Matthew Mueller <[email protected]>
+<[email protected]> <[email protected]>
+Shih-Yuan Lee <[email protected]>

AUTHORS

@@ -5,64 +5,98 @@
 #
 Al Tobey <[email protected]>
 Alex Gaynor <[email protected]>
+Alexander Larsson <[email protected]>
 Alexey Shamrin <[email protected]>
 Andrea Luzzardi <[email protected]>
+Andreas Savvides <[email protected]>
 Andreas Tiefenthaler <[email protected]>
+Andrew Macgregor <[email protected]>
 Andrew Munsell <[email protected]>
 Andrews Medina <[email protected]>
 Andy Rothfusz <[email protected]>
 Andy Smith <[email protected]>
 Anthony Bishopric <[email protected]>
 Antony Messerli <[email protected]>
+Asbjørn Enge <[email protected]>
 Barry Allard <[email protected]>
+Ben Toews <[email protected]>
+Benoit Chesneau <[email protected]>
+Bhiraj Butala <[email protected]>
+Bouke Haarsma <[email protected]>
 Brandon Liu <[email protected]>
+Brandon Philips <[email protected]>
 Brian McCallister <[email protected]>
 Brian Olsen <[email protected]>
+Brian Shumate <[email protected]>
+Briehan Lombaard <[email protected]>
 Bruno Bigras <[email protected]>
 Caleb Spare <[email protected]>
 Calen Pennington <[email protected]>
 Charles Hooper <[email protected]>
 Christopher Currie <[email protected]>
+Colin Dunklau <[email protected]>
 Colin Rice <[email protected]>
+Dan Buch <[email protected]>
+Daniel Garcia <[email protected]>
 Daniel Gasienica <[email protected]>
 Daniel Mizyrycki <[email protected]>
+Daniel Nordberg <[email protected]>
 Daniel Robinson <[email protected]>
 Daniel Von Fange <[email protected]>
 Daniel YC Lin <[email protected]>
 David Calavera <[email protected]>
 David Sissitka <[email protected]>
+Deni Bertovic <[email protected]>
 Dominik Honnef <[email protected]>
 Don Spaulding <[email protected]>
 Dr Nic Williams <[email protected]>
+Dražen Lučanin <[email protected]>
 Elias Probst <[email protected]>
 Emily Rose <[email protected]>
 Eric Hanchrow <[email protected]>
 Eric Myhre <[email protected]>
 Erno Hopearuoho <[email protected]>
+Evan Phoenix <[email protected]>
 Evan Wies <[email protected]>
 ezbercih <[email protected]>
 Fabrizio Regini <[email protected]>
+Faiz Khan <[email protected]>
 Fareed Dudhia <[email protected]>
 Flavio Castelli <[email protected]>
 Francisco Souza <[email protected]>
 Frederick F. Kautz IV <[email protected]>
 Gabriel Monroy <[email protected]>
 Gareth Rushgrove <[email protected]>
+Greg Thornton <[email protected]>
 Guillaume J. Charmes <[email protected]>
+Guruprasad <[email protected]>
 Harley Laue <[email protected]>
+Hector Castro <[email protected]>
 Hunter Blanks <[email protected]>
+Isao Jonas <[email protected]>
+James Carr <[email protected]>
+Jason McVetta <[email protected]>
+Jean-Baptiste Barth <[email protected]>
 Jeff Lindsay <[email protected]>
 Jeremy Grosser <[email protected]>
+Jim Alateras <[email protected]>
+Jimmy Cuadra <[email protected]>
+Joe Van Dyk <[email protected]>
 Joffrey F <[email protected]>
 Johan Euphrosine <[email protected]>
 John Costa <[email protected]>
 Jon Wedaman <[email protected]>
 Jonas Pfenniger <[email protected]>
+Jonathan Mueller <[email protected]>
 Jonathan Rudenberg <[email protected]>
+Joost Cassee <[email protected]>
+Jordan Arentsen <[email protected]>
 Joseph Anthony Pasquale Holsten <[email protected]>
 Julien Barbier <[email protected]>
 Jérôme Petazzoni <[email protected]>
 Karan Lyons <[email protected]>
+Karl Grzeszczak <[email protected]>
+Kawsar Saiyeed <[email protected]>
 Keli Hu <[email protected]>
 Ken Cochrane <[email protected]>
 Kevin Clark <[email protected]>
@@ -71,52 +105,84 @@ kim0 <[email protected]>
 Kimbro Staken <[email protected]>
 Kiran Gangadharan <[email protected]>
 Konstantin Pelykh <[email protected]>
+Kyle Conroy <[email protected]>
+Laurie Voss <[email protected]>
 Louis Opter <[email protected]>
+Manuel Meurer <[email protected]>
 Marco Hennings <[email protected]>
 Marcus Farkas <[email protected]>
+Marcus Ramberg <[email protected]>
 Mark McGranaghan <[email protected]>
-Martin Redmond <[email protected]>
+Marko Mikulicic <[email protected]>
+Markus Fix <[email protected]>
+Martin Redmond <[email protected]>
+Matt Apperson <[email protected]>
+Matt Bachmann <[email protected]>
+Matthew Mueller <[email protected]>
 Maxim Treskin <[email protected]>
 meejah <[email protected]>
 Michael Crosby <[email protected]>
+Michael Gorsuch <[email protected]>
+Miguel Angel Fernández <[email protected]>
 Mike Gaffney <[email protected]>
 Mikhail Sobolev <[email protected]>
+Mohit Soni <[email protected]>
+Morten Siebuhr <[email protected]>
 Nan Monnand Deng <[email protected]>
 Nate Jones <[email protected]>
 Nelson Chen <[email protected]>
 Niall O'Higgins <[email protected]>
+Nick Payne <[email protected]>
 Nick Stenning <[email protected]>
 Nick Stinemates <[email protected]>
 Nolan Darilek <[email protected]>
 odk- <[email protected]>
+Pascal Borreli <[email protected]>
 Paul Bowsher <[email protected]>
 Paul Hammond <[email protected]>
 Phil Spitler <[email protected]>
 Piotr Bogdan <[email protected]>
+pysqz <[email protected]>
+Ramon van Alteren <[email protected]>
 Renato Riccieri Santos Zannon <[email protected]>
 Rhys Hiltner <[email protected]>
 Robert Obryk <[email protected]>
 Roberto Hashioka <[email protected]>
 Ryan Fowler <[email protected]>
 Sam Alba <[email protected]>
 Sam J Sharpe <[email protected]>
+Sean P. Kane <[email protected]>
 Shawn Siefkas <[email protected]>
+Shih-Yuan Lee <[email protected]>
 Silas Sewell <[email protected]>
 Solomon Hykes <[email protected]>
+Song Gao <[email protected]>
+Sridatta Thatipamala <[email protected]>
 Sridhar Ratnakumar <[email protected]>
+Steeve Morin <[email protected]>
 Stefan Praszalowicz <[email protected]>
 Thatcher Peskens <[email protected]>
+Thermionix <[email protected]>
 Thijs Terlouw <[email protected]>
 Thomas Bikeev <[email protected]>
+Thomas Frössman <[email protected]>
 Thomas Hansen <[email protected]>
 Tianon Gravi <[email protected]>
 Tim Terhorst <[email protected]>
 Tobias Bieniek <[email protected]>
 Tobias Schmidt <[email protected]>
 Tobias Schwab <[email protected]>
 Tom Hulihan <[email protected]>
+Tommaso Visconti <[email protected]>
+Tyler Brock <[email protected]>
 unclejack <[email protected]>
+Victor Coisne <[email protected]>
+Victor Lyuboslavsky <[email protected]>
 Victor Vieux <[email protected]>
+Vincent Bernat <[email protected]>
 Vivek Agarwal <[email protected]>
+Vladimir Kirillov <[email protected]>
 Walter Stanish <[email protected]>
+Wes Morgan <[email protected]>
 Will Dietz <[email protected]>
+Zaiste! <[email protected]>

CHANGELOG.md

@@ -1,5 +1,83 @@
 # Changelog
 
+## 0.6.4 (2013-10-15)
+- Runtime: Add cleanup of container when Start() fails
+- Testing: Catch errClosing error when TCP and UDP proxies are terminated
+- Testing: Add aggregated docker-ci email report
+- Testing: Remove a few errors in tests
+* Contrib: Reorganize contributed completion scripts to add zsh completion
+* Contrib: Add vim syntax highlighting for Dockerfiles from @honza
+* Runtime: Add better comments to utils/stdcopy.go
+- Testing: add cleanup to remove leftover containers
+* Documentation: Document how to edit and release docs
+* Documentation: Add initial draft of the Docker infrastructure doc
+* Contrib: Add mkimage-arch.sh
+- Builder: Abort build if mergeConfig returns an error and fix duplicate error message
+- Runtime: Remove error messages which are not actually errors
+* Testing: Only run certain tests with TESTFLAGS='-run TestName' make.sh
+* Testing: Prevent docker-ci to test closing PRs
+- Documentation: Minor updates to postgresql_service.rst
+* Testing: Add nightly release to docker-ci
+* Hack: Improve network performance for VirtualBox
+* Hack: Add vagrant user to the docker group
+* Runtime: Add utils.Errorf for error logging
+- Packaging: Remove deprecated packaging directory
+* Hack: Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.)
+- Hack: Fix contrib/mkimage-debian.sh apt caching prevention
+* Documentation: Clarify LGTM process to contributors
+- Documentation: Small fixes to parameter names in docs for ADD command
+* Runtime: Record termination time in state.
+- Registry: Use correct auth config when logging in.
+- Documentation: Corrected error in the package name
+* Documentation: Document what `vagrant up` is actually doing
+- Runtime: Fix `docker rm` with volumes
+- Runtime: Use empty string so TempDir uses the OS's temp dir automatically
+- Runtime: Make sure to close the network allocators
+* Testing: Replace panic by log.Fatal in tests
++ Documentation: improve doc search results
+- Runtime: Fix some error cases where a HTTP body might not be closed
+* Hack: Add proper bash completion for "docker push"
+* Documentation: Add devenvironment link to CONTRIBUTING.md
+* Documentation: Cleanup whitespace in API 1.5 docs
+* Documentation: use angle brackets in MAINTAINER example email
+- Testing: Increase TestRunDetach timeout
+* Documentation: Fix help text for -v option
++ Hack: Added Dockerfile.tmLanguage to contrib
++ Runtime: Autorestart containers by default
+* Testing: Adding more tests around auth.ResolveAuthConfig
+* Hack: Configured FPM to make /etc/init/docker.conf a config file
+* Hack: Add xz utils as a runtime dep
+* Documentation: Add `apt-get install curl` to Ubuntu docs
+* Documentation: Remove Gentoo install notes about #1422 workaround
+* Documentation: Fix Ping endpoint documentation
+* Runtime: Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
+* Runtime: lxc: Allow set_file_cap capability in container
+* Documentation: Update archlinux.rst
+- Documentation: Fix ironic typo in changelog
+* Documentation: Add explanation for export restrictions
+* Hack: Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
++ Documentation: Changes to a new style for the docs. Includes version switcher.
+* Documentation: Formatting, add information about multiline json
++ Hack: Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
+- Runtime: Fix panic with wrong dockercfg file
+- Runtime: Fix the attach behavior with -i
+* Documentation: Add .dockercfg doc
+- Runtime: Move run -rm to the cli only
+* Hack: Enable SSH Agent forwarding in Vagrant VM
++ Runtime: Add -rm to docker run for removing a container on exit
+* Documentation: Improve registry and index REST API documentation
+* Runtime: Split stdout stderr
+- Documentation: Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
+* Documentation: Update Gentoo installation documentation now that we're in the portage tree proper
+- Registry: Fix the error message so it is the same as the regex
+* Runtime: Always create a new session for the container
+* Hack: Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly
+* Documentation: Various command fixes in postgres example
+* Documentation: Cleanup and reorganize docs and tooling for contributors and maintainers
+- Documentation: Minor spelling correction of protocoll -> protocol
+* Hack: Several small tweaks/fixes for contrib/mkimage-debian.sh
++ Hack: Add @tianon to hack/MAINTAINERS
+
 ## 0.6.3 (2013-09-23)
 * Packaging: Update tar vendor dependency
 - Client: Fix detach issue
@@ -26,7 +104,7 @@
 * Registry: Implement login with private registry
 * Remote API: Bump to v1.5
 * Packaging: Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
-* Documentation: General improvments
+* Documentation: General improvements
 - Runtime: UID and GID are now also applied to volumes
 - Runtime: `docker start` set error code upon error
 - Runtime: `docker run` set the same error code as the process started

CONTRIBUTING.md

@@ -3,6 +3,10 @@
 Want to hack on Docker? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels
 wrong or incomplete.
 
+## Build Environment
+
+For instructions on setting up your development environment, please see our dedicated [dev environment setup docs](http://docs.docker.io/en/latest/contributing/devenvironment/).
+
 ## Contribution guidelines
 
 ### Pull requests are always welcome
@@ -55,8 +59,10 @@ Submit unit tests for your changes.  Go has a great test framework built in; use
 it! Take a look at existing tests for inspiration. Run the full test suite on
 your branch before submitting a pull request.
 
-Make sure you include relevant updates or additions to documentation when
-creating or modifying features.
+Update the documentation when creating or modifying features. Test
+your documentation changes for clarity, concision, and correctness, as
+well as a clean docmuent build. See ``docs/README.md`` for more
+information on building the docs and how docs get released.
 
 Write clean code. Universally formatted code promotes ease of writing, reading,
 and maintenance. Always run `go fmt` before committing your changes. Most
@@ -89,53 +95,17 @@ name and email address match your git configuration. The AUTHORS file is
 regenerated occasionally from the git commit history, so a mismatch may result
 in your changes being overwritten.
 
+### Approval
 
-## Decision process
-
-### How are decisions made?
-
-Short answer: with pull requests to the docker repository.
-
-Docker is an open-source project with an open design philosophy. This means that the repository is the source of truth for EVERY aspect of the project,
-including its philosophy, design, roadmap and APIs. *If it's part of the project, it's in the repo. It's in the repo, it's part of the project.*
-
-As a result, all decisions can be expressed as changes to the repository. An implementation change is a change to the source code. An API change is a change to
-the API specification. A philosophy change is a change to the philosophy manifesto. And so on.
-
-All decisions affecting docker, big and small, follow the same 3 steps:
-
-* Step 1: Open a pull request. Anyone can do this.
-
-* Step 2: Discuss the pull request. Anyone can do this.
-
-* Step 3: Accept or refuse a pull request. The relevant maintainer does this (see below "Who decides what?")
-
-
-### Who decides what?
-
-So all decisions are pull requests, and the relevant maintainer makes the decision by accepting or refusing the pull request.
-But how do we identify the relevant maintainer for a given pull request?
+Docker maintainers use LGTM (looks good to me) in comments on the code review
+to indicate acceptance.
 
-Docker follows the timeless, highly efficient and totally unfair system known as [Benevolent dictator for life](http://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life),
-with yours truly, Solomon Hykes, in the role of BDFL.
-This means that all decisions are made by default by me. Since making every decision myself would be highly unscalable, in practice decisions are spread across multiple maintainers.
+A change requires LGTMs from an absolute majority of the maintainers of each
+component affected. For example, if a change affects docs/ and registry/, it
+needs an absolute majority from the maintainers of docs/ AND, separately, an
+absolute majority of the maintainers of registry
 
-The relevant maintainer for a pull request is assigned in 3 steps:
-
-* Step 1: Determine the subdirectory affected by the pull request. This might be src/registry, docs/source/api, or any other part of the repo.
-
-* Step 2: Find the MAINTAINERS file which affects this directory. If the directory itself does not have a MAINTAINERS file, work your way up the the repo hierarchy until you find one.
-
-* Step 3: The first maintainer listed is the primary maintainer. The pull request is assigned to him. He may assign it to other listed maintainers, at his discretion.
-
-
-### I'm a maintainer, should I make pull requests too?
-
-Primary maintainers are not required to create pull requests when changing their own subdirectory, but secondary maintainers are.
-
-### Who assigns maintainers?
-
-Solomon.
+For more details see [MAINTAINERS.md](hack/MAINTAINERS.md)
 
 ### How can I become a maintainer?
 
@@ -146,15 +116,3 @@ Solomon.
 Don't forget: being a maintainer is a time investment. Make sure you will have time to make yourself available.
 You don't have to be a maintainer to make a difference on the project!
 
-### What are a maintainer's responsibility?
-
-It is every maintainer's responsibility to:
-
-* 1) Expose a clear roadmap for improving their component.
-* 2) Deliver prompt feedback and decisions on pull requests.
-* 3) Be available to anyone with questions, bug reports, criticism etc. on their component. This includes irc, github requests and the mailing list.
-* 4) Make sure their component respects the philosophy, design and roadmap of the project.
-
-### How is this process changed?
-
-Just like everything else: by making a pull request :)