0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8468 commits 14 branches 412 tags 338 MiB
Commit graph

8468 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
a22622b022 Merge pull request #5983 from vieux/add_tianon_mailmap_authors 
add Tianon as maintainer of AUTHORS and .mailmap
 2014-05-27 10:43:17 -07:00
Tianon Gravi
b2cf28306d Merge pull request #6029 from jeffreybolle/master 
Update upstart script to ensure networking is up before starting docker
 2014-05-27 11:23:54 -06:00
James Turnbull
cf47b46036 Merge pull request #6046 from thomasleveil/patch-1 
Update ubuntulinux.md - bash completion
 2014-05-27 05:39:39 -07:00
Thomas LEVEIL
250229605f Update ubuntulinux.md and debian.md 
to add bash completion for the docker command
 2014-05-27 14:17:01 +02:00
O.S. Tezer
e5ba9f6443 Merge pull request #6042 from dcorking/patch-1 
Update fedora.md
 2014-05-26 12:27:45 -07:00
David Corking
b26bebac31 Update fedora.md 
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
 2014-05-26 12:29:27 +01:00
Sven Dowideit
4a2ca56ea0 Merge pull request #6039 from zdover23/26May_dockerfile 
Dockerfile.5.md stub
 2014-05-26 16:46:12 +10:00
Zac Dover
41a913b390 Dockerfile.5.md stub 
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
 2014-05-26 15:57:20 +10:00
Tianon Gravi
bddcbc1b15 Merge pull request #6037 from tianon/fix-debootstrap-typo 
Fix embarrassing debootstrap typo :)
 2014-05-25 22:37:59 -06:00
Tianon Gravi
dd3319636d Fix embarrassing debootstrap typo :) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-25 21:59:43 -06:00
Jeffrey Bolle
c52889db27 Ensure networking is up before starting docker 
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.

Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com> (github: jeffreybolle)
 2014-05-24 19:03:11 +01:00
James Turnbull
7393eafde7 Merge pull request #6001 from jamtur01/introfixes 
Some fixes to the Intro pages
 2014-05-25 00:21:40 +10:00
James Turnbull
955bfda99a Some fixes to the Intro pages 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-05-25 00:20:59 +10:00
Sven Dowideit
22777fbc1e Merge pull request #6006 from therealprologic/master 
Updated installation docs for CRUX as a Docker Host.
 2014-05-24 16:08:14 +10:00
Sven Dowideit
d81912e323 Merge pull request #6016 from ronsmits/patch-1 
Update using_supervisord.md
 2014-05-24 16:07:32 +10:00
Sven Dowideit
b820b9778f Merge pull request #6023 from proppy/patch-4 
docs/reference/builder: fix USER doc
 2014-05-24 13:41:34 +10:00
Johan Euphrosine
e89cb9a5e0 docs/reference/builder: fix USER doc 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-05-23 17:20:15 -07:00
Guillaume J. Charmes
baed5d7433 Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount 
now busybox as nc
 2014-05-23 14:48:24 -07:00
Michael Crosby
3b4b0a901d Merge pull request #6018 from vishh/stats_strongtype 
Strong type all stats exported by libcontainer
 2014-05-23 14:35:14 -07:00
Michael Crosby
f3bd86376e Merge pull request #6022 from crosbymichael/iptables-wait 
Add check for iptables xlock support
 2014-05-23 14:25:51 -07:00
Michael Crosby
034babf175 Add check for iptables xlock support 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 14:18:50 -07:00
Victor Vieux
0be44d1a0a now busybox as nc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-23 21:03:52 +00:00
Tibor Vass
7e38d6a358 Merge pull request #6019 from tianon/update-dockerfile-busybox 
Add specific branch of @jpetazzo's busybox to clone from so we can assume nice things about it
 2014-05-23 13:46:48 -07:00
Vishnu Kannan
321b457044 Added stats.go which provides strong types for all stats that will be exported by libcontainer. This commit only introduces the strong type. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-05-23 20:42:43 +00:00
Tianon Gravi
886d3c9396 Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-23 14:32:43 -06:00
Tianon Gravi
efa79a09a9 Add specific branch of jpetazzo's busybox to clone from so we can assume nice things about it 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-23 14:32:43 -06:00
Tibor Vass
cfded04ac2 Merge pull request #6015 from crosbymichael/update-test-flags 
Update integration tests with --net flag
 2014-05-23 13:31:47 -07:00
Tibor Vass
174ab74755 Merge pull request #5998 from crosbymichael/iptables-wait 
Add wait flag to iptables
 2014-05-23 13:31:35 -07:00
Michael Crosby
2487237937 Update ip test to parse new output 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 13:22:01 -07:00
Ron Smits
9429fe6f49 Update using_supervisord.md 
changed the version of ubuntu to 13.04. In latest sshd will not work.
 2014-05-23 21:15:44 +02:00
Victor Vieux
0874b85627 Merge pull request #6008 from rhatdan/umount 
We need to umount /var/lib/docker when the daemon exits.
 2014-05-23 12:01:38 -07:00
Victor Vieux
494cbbec44 Merge pull request #5993 from LK4D4/fix_race_on_stop_#5154 
Add synchronization between jobs and server closing
 2014-05-23 11:31:10 -07:00
Michael Crosby
581e8e8918 Update integration tests with --net flag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 11:31:01 -07:00
James Turnbull
973fae9d75 Merge pull request #5952 from nathanleclaire/patch-2 
Fix a few issues.
 2014-05-24 03:00:37 +10:00
Tianon Gravi
3c430e2599 Merge pull request #6012 from tianon/check-config-cgroup-subsystems 
Add more required cgroup subsystems to check-config.sh
 2014-05-23 10:43:16 -06:00
Nathan LeClaire
1e74cd0e01 Fix a few issues. 
-single-dash => --double-dash for a few flags, and also there was a missing "B", as in "Container B".

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com> (github: nathanleclaire)
 2014-05-23 09:36:27 -07:00
Tianon Gravi
0c0ffb7773 Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-23 10:27:09 -06:00
Dan Walsh
a3ff8a98f7 We need to umount /var/lib/docker when the daemon exits. 
Currently we are leaving it bind mounted on stop.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-05-23 11:43:46 -04:00
James Mills
c0529e5fc1 Updated installation docs for CRUX as a Docker Host. 
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
 2014-05-24 01:18:00 +10:00
James Turnbull
a6577708ab Merge pull request #5949 from nathanleclaire/patch-1 
Change single-dash flag usage to double-dash
 2014-05-23 13:43:23 +10:00
Michael Crosby
b315c380f4 Add wait flag to iptables 
Fixes #1573
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 01:24:58 +00:00
Tibor Vass
be622a78da Merge pull request #5997 from crosbymichael/add-hang 
Fix add hang when dest is .
 2014-05-22 17:48:51 -07:00
Michael Crosby
04e357d09f Merge pull request #25 from tiborvass/3960-add-file-hangs 
adding test for hanging ADD src .
 2014-05-22 17:38:11 -07:00
Tibor Vass
1ce5457d57 adding test for hanging ADD src . 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-05-22 17:28:04 -07:00
Michael Crosby
c8ada301ba Fix add hang when dest is . 
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 00:26:38 +00:00
Michael Crosby
3d78c49aab Merge pull request #5995 from vieux/recur_nodes 
Add device nodes recursively
 2014-05-22 16:35:27 -07:00
Victor Vieux
b6c65df093 update test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-22 22:50:41 +00:00
Victor Vieux
0abb52c7a9 add recursive device nodes 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-22 22:29:13 +00:00
Michael Crosby
24a58a66e3 Merge pull request #5994 from vmarmol/libcontainers-stats 
Make all cgroup stats output int64s instead of float64.
 2014-05-22 14:24:14 -07:00
Victor Marmol
4a33a757d5 Make all cgroup stats output int64s instead of float64. 
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
 2014-05-22 20:53:36 +00:00