Andy Rothfusz
10ec205b77
Updated AUTHORS file
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-08-12 16:19:10 -07:00
Andy Rothfusz
8830653977
Fix my email entry so that my current email is first and the old commit email second.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-08-12 13:24:42 -07:00
Tibor Vass
18a0eba72d
Merge pull request #7466 from tiborvass/irc-meetings
...
Add irc-meetings section in CONTRIBUTING
2014-08-12 13:36:57 -04:00
Tibor Vass
c58c70b8bd
Add irc-meetings section in CONTRIBUTING
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-12 13:35:14 -04:00
Victor Vieux
0771eb32dc
Merge pull request #7528 from lalyos/fix_version_number_comparison
...
Fix version number comparison
2014-08-12 10:16:55 -07:00
James Turnbull
d42326d927
Merge pull request #7531 from ChristopherBiscardi/priv-repos
...
Private Repos Copy Change
2014-08-12 09:50:21 -04:00
James Turnbull
96b52545ab
Merge pull request #7533 from cirocosta/patch-1
...
Updates docs regarding linux mint troubleshot
2014-08-12 08:21:30 -04:00
Ciro S. Costa
fcddecc828
Updates docs regarding linux mint troubleshot
...
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br>
2014-08-12 02:56:57 -03:00
Victor Vieux
01995ebebb
Merge pull request #7490 from crosbymichael/reexec
...
Use argv0 as reexec implementation for dockerinit
2014-08-11 18:43:34 -07:00
Michael Crosby
1a249a5feb
Panic if trying to register an func with the same name
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 18:13:27 -07:00
Sven Dowideit
2c882a482e
Merge pull request #7398 from SvenDowideit/add-more-details-to-https-docs
...
tell the user what to expect, including that it is a verbose process.
2014-08-12 10:35:28 +10:00
Sven Dowideit
b94f2c4c6d
tell the user what to expect, including that it is a verbode process.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-08-12 10:32:38 +10:00
ChristoperBiscardi
df9650eebb
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com> (github: ChristopherBiscardi)
2014-08-11 16:37:58 -07:00
lalyos
58ef92f89e
Fix equal short-long version number comparison
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-08-11 23:40:35 +02:00
lalyos
8a4d2d6f7f
Add test case for identical short and long version numbers
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
2014-08-11 23:36:09 +02:00
Fred Lifton
8595a4ff7a
Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
...
Add "DEBIAN_FRONTEND" to FAQ
2014-08-11 14:19:06 -07:00
Sebastiaan van Stijn
2e5d35c1f1
Add "DEBIAN_FRONTEND" to FAQ
...
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
2014-08-11 23:12:47 +02:00
Michael Crosby
57e0cbb991
Merge pull request #7507 from shykes/cleanup-tiny
...
Cleanup: tiny little things
2014-08-11 12:41:17 -07:00
Michael Crosby
9694209241
Fix hack in old integration test for new init
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:22 -07:00
Michael Crosby
29af9c14e4
Remove unsued sysinit package
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:21 -07:00
Michael Crosby
7321067176
Use argv0 as reexec implementation for dockerinit
...
This changes the way the exec drivers work by not specifing a -driver
flag on reexec. For each of the exec drivers they register their own
functions that will be matched aginst the argv 0 on exec and called if
they match.
This also allows any functionality to be added to docker so that the
binary can be reexec'd and any type of function can be called. I moved
the flag parsing on docker exec to the specific initializers so that the
implementations do not bleed into one another. This also allows for
more flexability within reexec initializers to specify their own flags
and options.
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:21 -07:00
Tibor Vass
e033425f0b
Merge pull request #7502 from LK4D4/catch_error_console
...
Catch error on console creation
2014-08-11 12:13:53 -04:00
Tibor Vass
5ffbc8dc82
Merge pull request #7509 from LK4D4/fix_http_handler_error_log
...
Fix log message on http handler error
2014-08-11 12:12:33 -04:00
Tibor Vass
e94d772910
Merge pull request #7499 from LK4D4/fix_events_error
...
Fix error message on logging events
2014-08-11 12:10:30 -04:00
Tibor Vass
a9ff2fdfac
Merge pull request #7520 from LK4D4/more_events_test
...
More events test
2014-08-11 12:09:11 -04:00
unclejack
f4f1e4db70
Merge pull request #6301 from rail44/feature-load-only-not-exist-image
...
Use only unavailable image when load from Tarball
2014-08-11 11:28:52 +03:00
Alexandr Morozov
44842ea3d8
Test on untag and delete events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-11 11:39:47 +04:00
Alexandr Morozov
17ab516fde
Test on container events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-11 10:42:55 +04:00
Solomon Hykes
b74e507245
Merge pull request #7496 from shykes/cleanup-push-pull
...
Cleanup: move "pull" and "push" to graph/pull.go and graph/push.go
2014-08-10 23:29:28 -07:00
James Turnbull
9fa4bea03b
Merge pull request #7489 from duglin/7281
...
fix for issue 7281
2014-08-10 13:27:21 -04:00
James Turnbull
dfd6fcb548
Merge pull request #7498 from ostezer/fix-builds-errors
...
Docs: Fix builds.md line-length + minor typo issues
2014-08-10 13:26:16 -04:00
James Turnbull
7b13212076
Merge pull request #7501 from wyc/patch-1
...
Update gentoolinux.md
2014-08-10 13:20:14 -04:00
James Turnbull
aa3bc6559b
Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
...
fix command output examples in cli documentation
2014-08-10 13:18:50 -04:00
Patrick Hemmer
d613f11217
fix command output examples in cli documentation
...
f87a97f
accidentally added a few too many `$` line prefixes
Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
2014-08-10 12:47:46 -04:00
Alexandr Morozov
e9aa6489a6
Fix log message on http handler error
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-10 13:30:22 +04:00
Solomon Hykes
a110ce2f28
Rename a method for clarity
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-10 04:33:19 +00:00
Solomon Hykes
5e9b3727b8
Move declaration of DockerCli to top of file for readability
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-10 04:31:59 +00:00
Alexandr Morozov
93f6cf0351
Catch error on console creation
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-09 22:10:44 +04:00
wyc
6ba1949e6a
Update gentoolinux.md
2014-08-09 14:00:29 -04:00
LK4D4
7afc49b40b
Fix error message on logging events
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-09 18:45:38 +04:00
Doug Davis
55dc4f2b94
fix for issue 7281
...
add missing comma per O.S. Tezer's commment
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-08-09 08:11:59 -04:00
O.S. Tezer
8b3f2381d0
Docs: Fix builds.md line-length + minor typo issues
...
This PR proposes to fix some already existing (i.e., older)
line-length & line-alignment issues and the ones recently
included/merged with the PR #7406
(https://github.com/docker/docker/pull/7406 ).
It also proposes to fix a couple minor typography mistakes
(i.e., spelling of GitHub and Service Hooks (headers))
This PR does *not* propose any content changes.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-08-09 14:55:47 +03:00
Michael Crosby
2c90fde982
Merge pull request #7449 from shykes/cleanup-shutdown
...
Cleanup: refactor shutdown and signal handling facility
2014-08-08 19:39:51 -07:00
Tianon Gravi
93da07a8dc
Merge pull request #7492 from crosbymichael/update-libcontainer-aug3
...
Update libcontainer to f2e78425c377acc7a67a35c3148
2014-08-08 17:44:13 -06:00
Michael Crosby
983b4fc3bf
Merge pull request #7475 from erikh/fix_hostname_parsing
...
fix parsing of hostnames when we actually want IP addresses.
2014-08-08 16:40:50 -07:00
Michael Crosby
c74e8b544d
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-08 16:12:35 -07:00
Erik Hollensbe
99a864431d
First stab at nat tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-08 15:01:12 -07:00
Erik Hollensbe
3c49cb17fb
fix parsing of hostnames when we actually want IP addresses.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-08 15:01:10 -07:00
Hollie Teal
2dc21af70b
Merge pull request #7406 from hollietealok/docs_add
...
Added "Github Submodules" section to Automated Builds doc.
2014-08-08 09:40:42 -07:00
James Turnbull
fb650d1e6d
Merge pull request #7465 from flavio/update-opensuse-doc
...
Updated openSUSE's installation instructions
2014-08-08 11:28:27 -04:00