Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Victor Vieux
b700ee006a
Merge pull request #2777 from dotcloud/fix_port_stop_start
...
don't import emport empty hostconfig
2013-11-19 18:36:22 -08:00
Victor Vieux
0169cf15dd
don't import emport empty hostconfig
2013-11-19 18:28:50 -08:00
Michael Crosby
234f5ac39f
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
...
Simplify the runtime Register reconnect logic
2013-11-19 17:30:59 -08:00
Victor Vieux
d575918038
Merge pull request #2748 from jpoimboe/fix-restart-race-condition
...
fix container restart race condition
2013-11-19 16:26:13 -08:00
Josh Poimboeuf
3cbec95177
simplify the runtime Register reconnect logic
...
Refactor the Register code a little bit to make it easier to comprehend.
2013-11-19 14:09:30 -06:00
Michael Crosby
9d867a389b
Merge pull request #2759 from dotcloud/lintify-1
...
Lintify code with confidence=1
2013-11-19 11:26:15 -08:00
Andy Rothfusz
4eaba8de91
Merge pull request #2757 from Painted-Fox/patch-2
...
Simplify the upstart example in host_integration.rst
2013-11-19 10:29:54 -08:00
Andy Rothfusz
434c1613a4
Merge pull request #2770 from tianon/better-man-page
...
Switch sphinx man_pages generation to use commandline/cli
2013-11-19 10:28:50 -08:00
Andy Rothfusz
18da26c62a
Merge pull request #2766 from sbellem/doc-improvements
...
fixed typos, and made small improvements to the wording
2013-11-19 10:27:25 -08:00
Ryan Seto
1da8c50ded
Fix quote mistake.
2013-11-19 12:14:39 -05:00
Tianon Gravi
1cd9529ad3
Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page
2013-11-19 10:10:42 -07:00
Daniel Mizyrycki
f78d45863c
Merge pull request #2734 from zitrusmedia/master
...
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-19 09:04:28 -08:00
Sylvain Bellemare
3656db66d2
fixed typos, and made small improvements to the wording
2013-11-19 14:44:50 +01:00
Ryan Seto
194d4b9376
Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out.
2013-11-18 21:23:00 -05:00
Andy Rothfusz
1de02a70de
Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to-mount
...
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 17:27:49 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Andy Rothfusz
511a62a099
Merge pull request #2755 from metalivedev/test-2592
...
Replace PR#2592
2013-11-18 15:29:48 -08:00
Andy Rothfusz
256d46fe68
Merge pull request #2721 from metalivedev/2701-addmedia
...
Add security section and embed private registry video.
2013-11-18 15:29:35 -08:00
Ryan Seto
76ee860ece
Simplify the upstart example in host_integration.rst
...
Taking some pointers from @tianon on my pull request #2685 .
2013-11-18 16:21:03 -05:00
Andy Rothfusz
2ae1f29dfe
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 13:09:13 -08:00
Victor Vieux
f946a486ea
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
...
Fix tmp dir never cleanup
2013-11-18 12:20:23 -08:00
Guillaume J. Charmes
e008c7c068
Merge pull request #2743 from tianon/go1.2rc5
...
Update to go1.2rc5
2013-11-18 12:11:56 -08:00
Andy Rothfusz
669e4bac30
Merge pull request #2729 from SvenDowideit/docker-info-doc
...
add example for docker info
2013-11-18 11:44:54 -08:00
Andy Rothfusz
f6362fbb0e
Merge pull request #2726 from SvenDowideit/docker-history-doc
...
add example for docker history
2013-11-18 11:43:44 -08:00
Andy Rothfusz
c1cd824570
Merge pull request #2742 from rick/patch-1
...
Tiny typo cleanup
2013-11-18 11:37:37 -08:00
Michael Crosby
4546832507
Merge pull request #2752 from dotcloud/gofmt_test
...
Go fmt tests
2013-11-18 11:34:59 -08:00
Andy Rothfusz
b5934711d0
Merge pull request #2724 from SvenDowideit/docker-diff-example
...
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-18 11:34:05 -08:00
Victor Vieux
ed8f75d25c
gofmt_test
2013-11-18 11:25:13 -08:00
Michael Crosby
cfbd9ea16d
Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD
...
Do not forward SIGCHLD to container
2013-11-18 11:24:08 -08:00
Michael Crosby
75dd1663e0
Merge pull request #2638 from FreakyDazio/2506-name-conflict-error
...
More informative error message on name collisions
2013-11-18 11:13:43 -08:00
Darren Coxall
3c67a28493
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
2013-11-18 17:51:47 +00:00
Josh Poimboeuf
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
Josh Poimboeuf
fc2f5758cf
fix container restart race condition
...
Finish container cleanup before setting the state to stopped.
Otherwise, for an application that exits quickly, a call to Restart
can allow Start to be called again before cleanup is done, resulting in
overritten data in the Container struct.
2013-11-18 11:42:30 -06:00
Tianon Gravi
9e1da3ec9c
Update to go1.2rc5
2013-11-17 22:36:26 -07:00
Rick Bradley
b76574f855
Tiny typo cleanup
2013-11-17 21:10:06 -08:00
Tianon Gravi
457375ea37
Merge pull request #2732 from jplock/patch-2
...
Fix images not being properly tagged in mkimage-debootstrap.sh
2013-11-17 08:06:58 -08:00
Frederik Loeffert
7e580aacec
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-17 01:20:21 +01:00
Justin Plock
0e64b987e8
Fix images not being properly tagged
2013-11-16 11:05:38 -05:00
Sven Dowideit
5c741ef11d
add example
2013-11-16 20:53:45 +10:00
Sven Dowideit
f04142c1f7
add example for docker history
2013-11-16 20:36:33 +10:00
Sven Dowideit
af05ab399e
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-16 20:26:47 +10:00
Michael Crosby
51576069ad
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
2013-11-15 18:21:34 -08:00
Andy Rothfusz
d33ffe44a9
Fixes #2701 . Adds security section.
2013-11-15 18:12:35 -08:00
Solomon Hykes
afe230718e
Re-enable api integration tests using only public remote API.
2013-11-16 02:12:14 +00:00
Victor Vieux
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
Andy Rothfusz
e12bba66ea
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
2013-11-15 13:34:08 -08:00
Andy Rothfusz
92c3a319fb
Merge pull request #2713 from eugenkrizo/patch-2
...
port published explicitly (for docker 0.6.6)
2013-11-15 13:32:18 -08:00
Andy Rothfusz
323e86032d
Merge pull request #2685 from Painted-Fox/patch-1
...
Add more depth to the upstart example in host_integration.rst
2013-11-15 12:28:07 -08:00
Victor Vieux
c06d903edd
bring back tests about LXCConfig
2013-11-15 11:48:18 -08:00
