3b4b0a901d
Merge pull request #6018 from vishh/stats_strongtype
...
Strong type all stats exported by libcontainer
2014-05-23 14:35:14 -07:00
f3bd86376e
Merge pull request #6022 from crosbymichael/iptables-wait
...
Add check for iptables xlock support
2014-05-23 14:25:51 -07:00
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
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
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
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
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
cfded04ac2
Merge pull request #6015 from crosbymichael/update-test-flags
...
Update integration tests with --net flag
2014-05-23 13:31:47 -07:00
174ab74755
Merge pull request #5998 from crosbymichael/iptables-wait
...
Add wait flag to iptables
2014-05-23 13:31:35 -07:00
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
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
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
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
973fae9d75
Merge pull request #5952 from nathanleclaire/patch-2
...
Fix a few issues.
2014-05-24 03:00:37 +10:00
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
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
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
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
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
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
be622a78da
Merge pull request #5997 from crosbymichael/add-hang
...
Fix add hang when dest is .
2014-05-22 17:48:51 -07:00
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
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
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
3d78c49aab
Merge pull request #5995 from vieux/recur_nodes
...
Add device nodes recursively
2014-05-22 16:35:27 -07:00
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
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
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
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
f92d68a6ce
Add synchronization between jobs and server closing
...
Fixes #5154
Daemon waiting 15 seconds for finishing server jobs before shutdown. In
this time it doesn't accept new jobs. After this time, it shutdown
despite running jobs.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-22 22:54:49 +04:00
db1a3551a3
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
2014-05-22 10:54:05 -07:00
8006f6583d
Merge pull request #5967 from tianon/consolidated-mkimage
...
Add new consolidated mkimage scripts
2014-05-22 11:27:08 -06:00
32c1e3005f
Merge pull request #5990 from alexlarsson/no-discard-mkfs
...
devmapper: Don't enable discard during mkfs.ext4
2014-05-22 19:38:21 +03:00
42708181b1
devmapper: Don't enable discard during mkfs.ext4
...
There is no reason to do discard durink mkfs, as the filesystem
is on a newly allocated device anyway. Discard is a slow operation,
so this may help initial startup a bit, especially if you use a larger
thin pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-22 09:23:52 +02:00
7470ebf30b
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
2014-05-22 13:43:40 +10:00
55d41c3e21
Merge pull request #5976 from crosbymichael/getpids
...
Move get pid into cgroup implementation
2014-05-21 19:09:50 -07:00
5a0a03e394
Merge pull request #5922 from crosbymichael/host-dev-priv
...
Mount /dev in tmpfs for privileged containers
2014-05-21 18:56:24 -07:00
2fec15cff1
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
2014-05-22 11:35:17 +10:00
e7babb28cc
Change single-dash flag usage to double-dash
...
The single-dash long-form flag usage is deprecated.
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com> (github: nathanleclaire)
2014-05-21 17:07:04 -07:00
cd44cd26cb
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
2014-05-22 09:55:05 +10:00
a0260c1181
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
2014-05-21 16:53:03 -07:00
4bb4bf634a
Merge pull request #5859 from philips/append-etc-hosts-not-bind
...
fix(daemon): prepend host /etc/hosts instead of bind mounting
2014-05-21 15:57:59 -07:00
fe1d297b9d
Merge pull request #5895 from tianon/update-authors
...
Update AUTHORS and .mailmap
2014-05-21 22:57:05 +00:00
cedd76cb52
Merge pull request #5981 from philips/bump-go-systemd
...
vendor: bump github.com/coreos/go-systemd to v2
2014-05-21 15:52:35 -07:00
62468a3eba
Added BitBucket support to documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-22 08:35:10 +10:00
df5585b273
vendor: bump github.com/coreos/go-systemd to v2
...
There are a couple of bugfixes since this was last bumped. Pull them in.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-05-21 15:31:04 -07:00
61ac745d7a
integration-cli: fix spelling error in test
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-05-21 15:20:29 -07:00
5579bec47b
integration-cli: tests for /etc/hosts and net=host
...
Some basic tests to make sure this is acting correctly on machines.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-05-21 15:20:29 -07:00
718e522c71
Merge pull request #5979 from rhatdan/terminal
...
This check was backwards.
2014-05-21 14:51:13 -07:00
26b4a4920a
This check was backwards.
...
If I do a
docker events > /tmp/out
I do not want the control characters getting written to the file.
The check should check the output file not the input file.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-21 17:37:40 -04:00
Michael Crosby
Michael Crosby
Tibor Vass
Vishnu Kannan
Tianon Gravi
Victor Vieux
James Turnbull
Nathan LeClaire
Dan Walsh
Victor Vieux
Victor Marmol
Alexandr Morozov
unclejack
Alexander Larsson
Nathan LeClaire
Sven Dowideit
Brandon Philips