Skip to content

Commit 2f74b1c

Browse files
committed
Merge pull request #2255 from dotcloud/bump_0.6.4
Bump to 0.6.4
2 parents 3894add + e8da766 commit 2f74b1c

175 files changed

Lines changed: 6739 additions & 9464 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mailmap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,15 @@ Roberto Hashioka <roberto_hashioka@hotmail.com>
2626
Konstantin Pelykh <kpelykh@zettaset.com>
2727
David Sissitka <me@dsissitka.com>
2828
Nolan Darilek <nolan@thewordnerd.info>
29+
<mastahyeti@gmail.com> <mastahyeti@users.noreply.github.com>
30+
Benoit Chesneau <bchesneau@gmail.com>
31+
Jordan Arentsen <blissdev@gmail.com>
32+
Daniel Garcia <daniel@danielgarcia.info>
33+
Miguel Angel Fernández <elmendalerenda@gmail.com>
34+
Bhiraj Butala <abhiraj.butala@gmail.com>
35+
Faiz Khan <faizkhan00@gmail.com>
36+
Victor Lyuboslavsky <victor@victoreda.com>
37+
Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
38+
Matthew Mueller <mattmuelle@gmail.com>
39+
<mosoni@ebay.com> <mohitsoni1989@gmail.com>
40+
Shih-Yuan Lee <fourdollars@gmail.com>

AUTHORS

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,98 @@
55
#
66
Al Tobey <al@ooyala.com>
77
Alex Gaynor <alex.gaynor@gmail.com>
8+
Alexander Larsson <alexl@redhat.com>
89
Alexey Shamrin <shamrin@gmail.com>
910
Andrea Luzzardi <aluzzardi@gmail.com>
11+
Andreas Savvides <andreas@editd.com>
1012
Andreas Tiefenthaler <at@an-ti.eu>
13+
Andrew Macgregor <andrew.macgregor@agworld.com.au>
1114
Andrew Munsell <andrew@wizardapps.net>
1215
Andrews Medina <andrewsmedina@gmail.com>
1316
Andy Rothfusz <github@metaliveblog.com>
1417
Andy Smith <github@anarkystic.com>
1518
Anthony Bishopric <git@anthonybishopric.com>
1619
Antony Messerli <amesserl@rackspace.com>
20+
Asbjørn Enge <asbjorn@hanafjedle.net>
1721
Barry Allard <barry.allard@gmail.com>
22+
Ben Toews <mastahyeti@gmail.com>
23+
Benoit Chesneau <bchesneau@gmail.com>
24+
Bhiraj Butala <abhiraj.butala@gmail.com>
25+
Bouke Haarsma <bouke@webatoom.nl>
1826
Brandon Liu <bdon@bdon.org>
27+
Brandon Philips <brandon@ifup.co>
1928
Brian McCallister <brianm@skife.org>
2029
Brian Olsen <brian@maven-group.org>
30+
Brian Shumate <brian@couchbase.com>
31+
Briehan Lombaard <briehan.lombaard@gmail.com>
2132
Bruno Bigras <bigras.bruno@gmail.com>
2233
Caleb Spare <cespare@gmail.com>
2334
Calen Pennington <cale@edx.org>
2435
Charles Hooper <charles.hooper@dotcloud.com>
2536
Christopher Currie <codemonkey+github@gmail.com>
37+
Colin Dunklau <colin.dunklau@gmail.com>
2638
Colin Rice <colin@daedrum.net>
39+
Dan Buch <d.buch@modcloth.com>
40+
Daniel Garcia <daniel@danielgarcia.info>
2741
Daniel Gasienica <daniel@gasienica.ch>
2842
Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>
43+
Daniel Nordberg <dnordberg@gmail.com>
2944
Daniel Robinson <gottagetmac@gmail.com>
3045
Daniel Von Fange <daniel@leancoder.com>
3146
Daniel YC Lin <dlin.tw@gmail.com>
3247
David Calavera <david.calavera@gmail.com>
3348
David Sissitka <me@dsissitka.com>
49+
Deni Bertovic <deni@kset.org>
3450
Dominik Honnef <dominik@honnef.co>
3551
Don Spaulding <donspauldingii@gmail.com>
3652
Dr Nic Williams <drnicwilliams@gmail.com>
53+
Dražen Lučanin <kermit666@gmail.com>
3754
Elias Probst <mail@eliasprobst.eu>
3855
Emily Rose <emily@contactvibe.com>
3956
Eric Hanchrow <ehanchrow@ine.com>
4057
Eric Myhre <hash@exultant.us>
4158
Erno Hopearuoho <erno.hopearuoho@gmail.com>
59+
Evan Phoenix <evan@fallingsnow.net>
4260
Evan Wies <evan@neomantra.net>
4361
ezbercih <cem.ezberci@gmail.com>
4462
Fabrizio Regini <freegenie@gmail.com>
63+
Faiz Khan <faizkhan00@gmail.com>
4564
Fareed Dudhia <fareeddudhia@googlemail.com>
4665
Flavio Castelli <fcastelli@suse.com>
4766
Francisco Souza <f@souza.cc>
4867
Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
4968
Gabriel Monroy <gabriel@opdemand.com>
5069
Gareth Rushgrove <gareth@morethanseven.net>
70+
Greg Thornton <xdissent@me.com>
5171
Guillaume J. Charmes <guillaume.charmes@dotcloud.com>
72+
Guruprasad <lgp171188@gmail.com>
5273
Harley Laue <losinggeneration@gmail.com>
74+
Hector Castro <hectcastro@gmail.com>
5375
Hunter Blanks <hunter@twilio.com>
76+
Isao Jonas <isao.jonas@gmail.com>
77+
James Carr <james.r.carr@gmail.com>
78+
Jason McVetta <jason.mcvetta@gmail.com>
79+
Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
5480
Jeff Lindsay <progrium@gmail.com>
5581
Jeremy Grosser <jeremy@synack.me>
82+
Jim Alateras <jima@comware.com.au>
83+
Jimmy Cuadra <jimmy@jimmycuadra.com>
84+
Joe Van Dyk <joe@tanga.com>
5685
Joffrey F <joffrey@dotcloud.com>
5786
Johan Euphrosine <proppy@google.com>
5887
John Costa <john.costa@gmail.com>
5988
Jon Wedaman <jweede@gmail.com>
6089
Jonas Pfenniger <jonas@pfenniger.name>
90+
Jonathan Mueller <j.mueller@apoveda.ch>
6191
Jonathan Rudenberg <jonathan@titanous.com>
92+
Joost Cassee <joost@cassee.net>
93+
Jordan Arentsen <blissdev@gmail.com>
6294
Joseph Anthony Pasquale Holsten <joseph@josephholsten.com>
6395
Julien Barbier <write0@gmail.com>
6496
Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
6597
Karan Lyons <karan@karanlyons.com>
98+
Karl Grzeszczak <karl@karlgrz.com>
99+
Kawsar Saiyeed <kawsar.saiyeed@projiris.com>
66100
Keli Hu <dev@keli.hu>
67101
Ken Cochrane <kencochrane@gmail.com>
68102
Kevin Clark <kevin.clark@gmail.com>
@@ -71,52 +105,84 @@ kim0 <email.ahmedkamal@googlemail.com>
71105
Kimbro Staken <kstaken@kstaken.com>
72106
Kiran Gangadharan <kiran.daredevil@gmail.com>
73107
Konstantin Pelykh <kpelykh@zettaset.com>
108+
Kyle Conroy <kyle.j.conroy@gmail.com>
109+
Laurie Voss <github@seldo.com>
74110
Louis Opter <kalessin@kalessin.fr>
111+
Manuel Meurer <manuel@krautcomputing.com>
75112
Marco Hennings <marco.hennings@freiheit.com>
76113
Marcus Farkas <toothlessgear@finitebox.com>
114+
Marcus Ramberg <marcus@nordaaker.com>
77115
Mark McGranaghan <mmcgrana@gmail.com>
78-
Martin Redmond <mrtodo@gmail.com>
116+
Marko Mikulicic <mmikulicic@gmail.com>
117+
Markus Fix <lispmeister@gmail.com>
118+
Martin Redmond <martin@tinychat.com>
119+
Matt Apperson <me@mattapperson.com>
120+
Matt Bachmann <bachmann.matt@gmail.com>
121+
Matthew Mueller <mattmuelle@gmail.com>
79122
Maxim Treskin <zerthurd@gmail.com>
80123
meejah <meejah@meejah.ca>
81124
Michael Crosby <crosby.michael@gmail.com>
125+
Michael Gorsuch <gorsuch@github.com>
126+
Miguel Angel Fernández <elmendalerenda@gmail.com>
82127
Mike Gaffney <mike@uberu.com>
83128
Mikhail Sobolev <mss@mawhrin.net>
129+
Mohit Soni <mosoni@ebay.com>
130+
Morten Siebuhr <sbhr@sbhr.dk>
84131
Nan Monnand Deng <monnand@gmail.com>
85132
Nate Jones <nate@endot.org>
86133
Nelson Chen <crazysim@gmail.com>
87134
Niall O'Higgins <niallo@unworkable.org>
135+
Nick Payne <nick@kurai.co.uk>
88136
Nick Stenning <nick.stenning@digital.cabinet-office.gov.uk>
89137
Nick Stinemates <nick@stinemates.org>
90138
Nolan Darilek <nolan@thewordnerd.info>
91139
odk- <github@odkurzacz.org>
140+
Pascal Borreli <pascal@borreli.com>
92141
Paul Bowsher <pbowsher@globalpersonals.co.uk>
93142
Paul Hammond <paul@paulhammond.org>
94143
Phil Spitler <pspitler@gmail.com>
95144
Piotr Bogdan <ppbogdan@gmail.com>
145+
pysqz <randomq@126.com>
146+
Ramon van Alteren <ramon@vanalteren.nl>
96147
Renato Riccieri Santos Zannon <renato.riccieri@gmail.com>
97148
Rhys Hiltner <rhys@twitch.tv>
98149
Robert Obryk <robryk@gmail.com>
99150
Roberto Hashioka <roberto_hashioka@hotmail.com>
100151
Ryan Fowler <rwfowler@gmail.com>
101152
Sam Alba <sam.alba@gmail.com>
102153
Sam J Sharpe <sam.sharpe@digital.cabinet-office.gov.uk>
154+
Sean P. Kane <skane@newrelic.com>
103155
Shawn Siefkas <shawn.siefkas@meredith.com>
156+
Shih-Yuan Lee <fourdollars@gmail.com>
104157
Silas Sewell <silas@sewell.org>
105158
Solomon Hykes <solomon@dotcloud.com>
159+
Song Gao <song@gao.io>
160+
Sridatta Thatipamala <sthatipamala@gmail.com>
106161
Sridhar Ratnakumar <sridharr@activestate.com>
162+
Steeve Morin <steeve.morin@gmail.com>
107163
Stefan Praszalowicz <stefan@greplin.com>
108164
Thatcher Peskens <thatcher@dotcloud.com>
165+
Thermionix <bond711@gmail.com>
109166
Thijs Terlouw <thijsterlouw@gmail.com>
110167
Thomas Bikeev <thomas.bikeev@mac.com>
168+
Thomas Frössman <thomasf@jossystem.se>
111169
Thomas Hansen <thomas.hansen@gmail.com>
112170
Tianon Gravi <admwiggin@gmail.com>
113171
Tim Terhorst <mynamewastaken+git@gmail.com>
114172
Tobias Bieniek <Tobias.Bieniek@gmx.de>
115173
Tobias Schmidt <ts@soundcloud.com>
116174
Tobias Schwab <tobias.schwab@dynport.de>
117175
Tom Hulihan <hulihan.tom159@gmail.com>
176+
Tommaso Visconti <tommaso.visconti@gmail.com>
177+
Tyler Brock <tyler.brock@gmail.com>
118178
unclejack <unclejacksons@gmail.com>
179+
Victor Coisne <victor.coisne@dotcloud.com>
180+
Victor Lyuboslavsky <victor@victoreda.com>
119181
Victor Vieux <victor.vieux@dotcloud.com>
182+
Vincent Bernat <bernat@luffy.cx>
120183
Vivek Agarwal <me@vivek.im>
184+
Vladimir Kirillov <proger@wilab.org.ua>
121185
Walter Stanish <walter@pratyeka.org>
186+
Wes Morgan <cap10morgan@gmail.com>
122187
Will Dietz <w@wdtz.org>
188+
Zaiste! <oh@zaiste.net>

CHANGELOG.md

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,83 @@
11
# Changelog
22

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

CONTRIBUTING.md

Lines changed: 16 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
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
44
wrong or incomplete.
55

6+
## Build Environment
7+
8+
For instructions on setting up your development environment, please see our dedicated [dev environment setup docs](http://docs.docker.io/en/latest/contributing/devenvironment/).
9+
610
## Contribution guidelines
711

812
### Pull requests are always welcome
@@ -55,8 +59,10 @@ Submit unit tests for your changes. Go has a great test framework built in; use
5559
it! Take a look at existing tests for inspiration. Run the full test suite on
5660
your branch before submitting a pull request.
5761

58-
Make sure you include relevant updates or additions to documentation when
59-
creating or modifying features.
62+
Update the documentation when creating or modifying features. Test
63+
your documentation changes for clarity, concision, and correctness, as
64+
well as a clean docmuent build. See ``docs/README.md`` for more
65+
information on building the docs and how docs get released.
6066

6167
Write clean code. Universally formatted code promotes ease of writing, reading,
6268
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
8995
regenerated occasionally from the git commit history, so a mismatch may result
9096
in your changes being overwritten.
9197

98+
### Approval
9299

93-
## Decision process
94-
95-
### How are decisions made?
96-
97-
Short answer: with pull requests to the docker repository.
98-
99-
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,
100-
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.*
101-
102-
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
103-
the API specification. A philosophy change is a change to the philosophy manifesto. And so on.
104-
105-
All decisions affecting docker, big and small, follow the same 3 steps:
106-
107-
* Step 1: Open a pull request. Anyone can do this.
108-
109-
* Step 2: Discuss the pull request. Anyone can do this.
110-
111-
* Step 3: Accept or refuse a pull request. The relevant maintainer does this (see below "Who decides what?")
112-
113-
114-
### Who decides what?
115-
116-
So all decisions are pull requests, and the relevant maintainer makes the decision by accepting or refusing the pull request.
117-
But how do we identify the relevant maintainer for a given pull request?
100+
Docker maintainers use LGTM (looks good to me) in comments on the code review
101+
to indicate acceptance.
118102

119-
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),
120-
with yours truly, Solomon Hykes, in the role of BDFL.
121-
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.
103+
A change requires LGTMs from an absolute majority of the maintainers of each
104+
component affected. For example, if a change affects docs/ and registry/, it
105+
needs an absolute majority from the maintainers of docs/ AND, separately, an
106+
absolute majority of the maintainers of registry
122107

123-
The relevant maintainer for a pull request is assigned in 3 steps:
124-
125-
* 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.
126-
127-
* 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.
128-
129-
* 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.
130-
131-
132-
### I'm a maintainer, should I make pull requests too?
133-
134-
Primary maintainers are not required to create pull requests when changing their own subdirectory, but secondary maintainers are.
135-
136-
### Who assigns maintainers?
137-
138-
Solomon.
108+
For more details see [MAINTAINERS.md](hack/MAINTAINERS.md)
139109

140110
### How can I become a maintainer?
141111

@@ -146,15 +116,3 @@ Solomon.
146116
Don't forget: being a maintainer is a time investment. Make sure you will have time to make yourself available.
147117
You don't have to be a maintainer to make a difference on the project!
148118

149-
### What are a maintainer's responsibility?
150-
151-
It is every maintainer's responsibility to:
152-
153-
* 1) Expose a clear roadmap for improving their component.
154-
* 2) Deliver prompt feedback and decisions on pull requests.
155-
* 3) Be available to anyone with questions, bug reports, criticism etc. on their component. This includes irc, github requests and the mailing list.
156-
* 4) Make sure their component respects the philosophy, design and roadmap of the project.
157-
158-
### How is this process changed?
159-
160-
Just like everything else: by making a pull request :)

0 commit comments

Comments
 (0)