e460eaadbd
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
Upstream-commit: 7e38d6a358ff2869e25dc8c6954b4b1b0d1b46a0
Component: engine
2014-05-23 13:46:48 -07:00
19aaa7241b
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)
Upstream-commit: 886d3c939687672c6589120229c05435273b7d59
Component: engine
2014-05-23 14:32:43 -06:00
92526dc8b1
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)
Upstream-commit: efa79a09a92b41b07d0aee3c728d98eec5120730
Component: engine
2014-05-23 14:32:43 -06:00
5e62a79cdf
Merge pull request #6015 from crosbymichael/update-test-flags
...
Update integration tests with --net flag
Upstream-commit: cfded04ac2878f0252c6c0e865151c34fb9ee372
Component: engine
2014-05-23 13:31:47 -07:00
9358189374
Merge pull request #5998 from crosbymichael/iptables-wait
...
Add wait flag to iptables
Upstream-commit: 174ab747552bcc9fae9928f8bc0361ad9abafb4e
Component: engine
2014-05-23 13:31:35 -07:00
46f785b005
Update ip test to parse new output
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 24872379375dd66518f09b8063698c2d1fb08df9
Component: engine
2014-05-23 13:22:01 -07:00
44b4ad54dc
Merge pull request #6008 from rhatdan/umount
...
We need to umount /var/lib/docker when the daemon exits.
Upstream-commit: 0874b856271a4d5c05cfcbaa1efac482e7a91bc3
Component: engine
2014-05-23 12:01:38 -07:00
373cdb1136
Merge pull request #5993 from LK4D4/fix_race_on_stop_#5154
...
Add synchronization between jobs and server closing
Upstream-commit: 494cbbec4456ec5b6ef7c9a787bbca7efd411639
Component: engine
2014-05-23 11:31:10 -07:00
7dcc66f3df
Update integration tests with --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 581e8e891886e6db387ed27aabda7dd8f1d14174
Component: engine
2014-05-23 11:31:01 -07:00
05b5a11797
Merge pull request #5952 from nathanleclaire/patch-2
...
Fix a few issues.
Upstream-commit: 973fae9d75e1c354dc6631172d041740a2f543bc
Component: engine
2014-05-24 03:00:37 +10:00
8c1e9a02ad
Merge pull request #6012 from tianon/check-config-cgroup-subsystems
...
Add more required cgroup subsystems to check-config.sh
Upstream-commit: 3c430e259980d5cbc61e79ff3d3508aadb2361e5
Component: engine
2014-05-23 10:43:16 -06:00
2c5a72f5fe
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)
Upstream-commit: 1e74cd0e01009bfa8afb6058f748f282da5200d0
Component: engine
2014-05-23 09:36:27 -07:00
cd12b8d562
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)
Upstream-commit: 0c0ffb777354ab0d65fdb92fac47272584b2d217
Component: engine
2014-05-23 10:27:09 -06:00
d454476d00
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)
Upstream-commit: a3ff8a98f770ae35103e3ce3c4221c00b4efcb7f
Component: engine
2014-05-23 11:43:46 -04:00
1a0d737a90
Merge pull request #5949 from nathanleclaire/patch-1
...
Change single-dash flag usage to double-dash
Upstream-commit: a6577708abc9370cfe7603a543eb68ad0e37d7e3
Component: engine
2014-05-23 13:43:23 +10:00
d002ab21b5
Add wait flag to iptables
...
Fixes #1573
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b315c380f4acd65cc0428009702f99a266f96c59
Component: engine
2014-05-23 01:24:58 +00:00
d04aaf0cbe
Merge pull request #5997 from crosbymichael/add-hang
...
Fix add hang when dest is .
Upstream-commit: be622a78dab5ca5ccfeec3a8def01f421a1a0c6b
Component: engine
2014-05-22 17:48:51 -07:00
e231f0ebed
Merge pull request #25 from tiborvass/3960-add-file-hangs
...
adding test for hanging ADD src .
Upstream-commit: 04e357d09fe63785364a6c8ee2435d409cf715a0
Component: engine
2014-05-22 17:38:11 -07:00
dae04453b9
adding test for hanging ADD src .
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 1ce5457d57d783d6c61557681970bf0977621e78
Component: engine
2014-05-22 17:28:04 -07:00
0b384856c1
Fix add hang when dest is .
...
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c8ada301baf66360af6a3445b7c2abd629da3fd1
Component: engine
2014-05-23 00:26:38 +00:00
258b16035a
Merge pull request #5995 from vieux/recur_nodes
...
Add device nodes recursively
Upstream-commit: 3d78c49aab0829e6c3bcf63b2d7b2d162d11a11e
Component: engine
2014-05-22 16:35:27 -07:00
cb5e9c4323
update test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b6c65df093111072bb44d42d650b591adb1bbbe0
Component: engine
2014-05-22 22:50:41 +00:00
e0f1623f01
add recursive device nodes
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0abb52c7a97940dc17c45ac45226af8156d0e712
Component: engine
2014-05-22 22:29:13 +00:00
2e4b87e141
Merge pull request #5994 from vmarmol/libcontainers-stats
...
Make all cgroup stats output int64s instead of float64.
Upstream-commit: 24a58a66e3d54efab0feb52f81b07ca24c1c1136
Component: engine
2014-05-22 14:24:14 -07:00
c13069d05f
Make all cgroup stats output int64s instead of float64.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 4a33a757d540acd059ac957542527d641548e2cf
Component: engine
2014-05-22 20:53:36 +00:00
022fe9a0d3
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)
Upstream-commit: f92d68a6cedd069c138ac83961ad54ceb937ebd0
Component: engine
2014-05-22 22:54:49 +04:00
456a42e6c9
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
2014-05-22 10:54:05 -07:00
4f40541082
Merge pull request #5967 from tianon/consolidated-mkimage
...
Add new consolidated mkimage scripts
Upstream-commit: 8006f6583d38dbb87e9d525089c0e4d2f933f918
Component: engine
2014-05-22 11:27:08 -06:00
2ded043703
Merge pull request #5990 from alexlarsson/no-discard-mkfs
...
devmapper: Don't enable discard during mkfs.ext4
Upstream-commit: 32c1e3005f9c938b73bfe4919e7b1a236cbb7111
Component: engine
2014-05-22 19:38:21 +03:00
3bbd8860d6
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)
Upstream-commit: 42708181b1976a768428568e664c566717ade8c4
Component: engine
2014-05-22 09:23:52 +02:00
8eeac92781
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
Upstream-commit: 7470ebf30b8b8bce03ae536cebbae71bfbe474f9
Component: engine
2014-05-22 13:43:40 +10:00
f41d7794be
Merge pull request #5976 from crosbymichael/getpids
...
Move get pid into cgroup implementation
Upstream-commit: 55d41c3e21e1593b944c06196ffb2ac57ab7f653
Component: engine
2014-05-21 19:09:50 -07:00
69fad1b67f
Merge pull request #5922 from crosbymichael/host-dev-priv
...
Mount /dev in tmpfs for privileged containers
Upstream-commit: 5a0a03e3942651a07858c278c4b40a0ead50eccb
Component: engine
2014-05-21 18:56:24 -07:00
0574a90328
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
Upstream-commit: 2fec15cff181775ffc86bd3def69ed41de917367
Component: engine
2014-05-22 11:35:17 +10:00
beaedbfd4c
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)
Upstream-commit: e7babb28ccb2d451baec9a8cb83e627390cbcdd4
Component: engine
2014-05-21 17:07:04 -07:00
f57c9e34ac
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
Upstream-commit: cd44cd26cbea8837a29e133be6d4fd194f51d39c
Component: engine
2014-05-22 09:55:05 +10:00
26f3790636
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
Upstream-commit: a0260c1181779365a924c913b8e886119d055cf9
Component: engine
2014-05-21 16:53:03 -07:00
d979c2acea
Merge pull request #5859 from philips/append-etc-hosts-not-bind
...
fix(daemon): prepend host /etc/hosts instead of bind mounting
Upstream-commit: 4bb4bf634a0a056ff8fb4186875c004e156f012d
Component: engine
2014-05-21 15:57:59 -07:00
0bf4f2fdea
Merge pull request #5895 from tianon/update-authors
...
Update AUTHORS and .mailmap
Upstream-commit: fe1d297b9df84ce87d71c4cecd800e2490252547
Component: engine
2014-05-21 22:57:05 +00:00
683b5fb8ba
Merge pull request #5981 from philips/bump-go-systemd
...
vendor: bump github.com/coreos/go-systemd to v2
Upstream-commit: cedd76cb526ab9b281293bdf658d236ad32a6950
Component: engine
2014-05-21 15:52:35 -07:00
9eed719a4d
Added BitBucket support to documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 62468a3eba4d115c16388fb4f67d6adfe4bbb0fc
Component: engine
2014-05-22 08:35:10 +10:00
fe98fe4b11
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)
Upstream-commit: df5585b273686324e9fd8269a6492409698623ee
Component: engine
2014-05-21 15:31:04 -07:00
519b053861
integration-cli: fix spelling error in test
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 61ac745d7a7dd192948e0c1cfbdff87af7715c92
Component: engine
2014-05-21 15:20:29 -07:00
8fa886baf3
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)
Upstream-commit: 5579bec47be6279569e69c72cccf87864af481de
Component: engine
2014-05-21 15:20:29 -07:00
b37a1659d6
Merge pull request #5979 from rhatdan/terminal
...
This check was backwards.
Upstream-commit: 718e522c7124789cce120b77c96a420de971722c
Component: engine
2014-05-21 14:51:13 -07:00
0ca8d92d2e
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)
Upstream-commit: 26b4a4920adca614f6be17a96f254f331271faf0
Component: engine
2014-05-21 17:37:40 -04:00
189f43a3ba
Move get pid into cgroup implementation
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 811d93326bc2d9451eb444e2343bb3063611de7a
Component: engine
2014-05-21 21:14:07 +00:00
4f4d0b0064
Rewrite of the Introduction documentation
...
1. Re-aligns the introduction with the new product positioning.
2. Cleanup of some issues with language and formatting.
3. Makes the introduction leaner and meaner.
4. Responds to feedback from product.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 0056884090726f736af2594b09aaa44e373a84d1
Component: engine
2014-05-22 07:11:43 +10:00
d951df01e3
Merge pull request #5958 from erikh/5738-docker_port_in_use
...
docker port in use
Upstream-commit: b7f9e683c3edd5c48062d00cfe3ea279e8037106
Component: engine
2014-05-21 21:06:27 +00:00
d6d188680f
Merge pull request #5975 from tianon/revert-run-tmpfs
...
Revert "Always mount a /run tmpfs in the container"
Upstream-commit: 457cb86cf2bb40fdce3e6b6a49d5eaec454a617b
Component: engine
2014-05-21 13:46:48 -07:00
