Alexandr Morozov
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
James Turnbull
7470ebf30b
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
2014-05-22 13:43:40 +10:00
Victor Vieux
55d41c3e21
Merge pull request #5976 from crosbymichael/getpids
...
Move get pid into cgroup implementation
2014-05-21 19:09:50 -07:00
Victor Vieux
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
James Turnbull
2fec15cff1
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
2014-05-22 11:35:17 +10:00
James Turnbull
cd44cd26cb
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
2014-05-22 09:55:05 +10:00
Sven Dowideit
a0260c1181
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
2014-05-21 16:53:03 -07:00
Michael Crosby
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
Victor Vieux
fe1d297b9d
Merge pull request #5895 from tianon/update-authors
...
Update AUTHORS and .mailmap
2014-05-21 22:57:05 +00:00
Victor Vieux
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
James Turnbull
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
Brandon Philips
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
Brandon Philips
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
Brandon Philips
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
Michael Crosby
718e522c71
Merge pull request #5979 from rhatdan/terminal
...
This check was backwards.
2014-05-21 14:51:13 -07:00
Dan Walsh
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
811d93326b
Move get pid into cgroup implementation
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-21 21:14:07 +00:00
James Turnbull
0056884090
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)
2014-05-22 07:11:43 +10:00
Victor Vieux
b7f9e683c3
Merge pull request #5958 from erikh/5738-docker_port_in_use
...
docker port in use
2014-05-21 21:06:27 +00:00
Victor Vieux
457cb86cf2
Merge pull request #5975 from tianon/revert-run-tmpfs
...
Revert "Always mount a /run tmpfs in the container"
2014-05-21 13:46:48 -07:00
Tianon Gravi
8e967fe802
Revert "Always mount a /run tmpfs in the container"
...
This reverts commit 905795ece6
.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-21 14:28:19 -06:00
Michael Crosby
2ff4f71528
Merge pull request #5953 from tiborvass/remove-chmod-755
...
remove chmod 755: fixes #5941
2014-05-21 12:27:06 -07:00
Tibor Vass
bb431a7190
for perms checking tests, create files from Go and remove them from git
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-05-21 11:35:12 -07:00
Tibor Vass
56a53c72d2
remove chmod 755: fixes #5941
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-05-21 11:35:08 -07:00
James Turnbull
29a192ca4d
Merge pull request #5965 from cpuguy83/5963-fix-single-dash-in-working-with-volumes
...
Fixes some docs issues with using single-dash arguments where they should be double
2014-05-22 03:31:46 +10:00
Victor Vieux
286a17ff19
Merge pull request #5955 from anandkumarpatel/5923-fix-leaking-go-routine
...
5923-fix-leaking-go-routine
2014-05-21 10:11:56 -07:00
Erik Hollensbe
91ba337931
bridge: retry any proxy set up failures until we get a successful port, defeats a race condition
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-05-21 09:14:53 -07:00
Erik Hollensbe
f0489ce3a9
portallocator: rewrite to simplify, removes race condition
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-05-21 09:14:53 -07:00
Brian Goff
6d9e64b27b
Fixes some docs issues with using single-dash arguments where they should be double
...
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-05-21 09:35:22 -04:00
unclejack
a94a87778c
Merge pull request #5954 from vieux/fix_cp_error
...
Ignore lchown error on docker cp
2014-05-21 15:55:57 +03:00
tpng
accea18920
Add instructions for persisting data
...
Docker-DCO-1.1-Signed-off-by: Benny Ng <benny.tpng@gmail.com> (github: tpng)
2014-05-21 16:45:41 +08:00
James Turnbull
f37339c2db
Merge pull request #5765 from jamtur01/contribf
...
Added to small patch exemption to cover Markdown/syntax errors
2014-05-21 17:13:03 +10:00
AnandkumarPatel
789a8f2616
use buffered channel so goroutine does not get blocked on done <- true when a timeout occurs.
...
Docker-DCO-1.1-Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com> (github: anandkumarpatel)
2014-05-20 21:33:40 -07:00
Michael Crosby
f042c3c157
Update code post codereview
...
Add specific types for Required and Optional DeviceNodes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-21 00:40:41 +00:00
Victor Vieux
9e51b7abae
ignore lchown error on docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-21 00:23:17 +00:00
Victor Vieux
5eef0a28cb
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-21 00:10:07 +00:00
Michael Crosby
ed5892ed4e
Update documentation for container struct in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-20 23:34:46 +00:00
Michael Crosby
34c05c58c8
Mount /dev in tmpfs for privileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-20 22:51:24 +00:00
Michael Crosby
83e9dc7200
Merge pull request #5755 from vieux/move_inspect_daemon
...
move inspect from server to daemon
2014-05-20 15:50:38 -07:00
Tianon Gravi
1f219672fa
Merge pull request #5950 from tianon/update-deps
...
Update gorilla/mux, gorilla/context, and kr/pty deps
2014-05-20 16:16:21 -06:00
Michael Crosby
1310243d48
Merge pull request #5946 from crosbymichael/lxc-host-net
...
Fix network mode for lxc 1.0
2014-05-20 14:51:33 -07:00
Victor Vieux
240fad4974
Merge pull request #5951 from vieux/pr5919
...
Fix remote add cache
2014-05-20 14:33:05 -07:00
Victor Vieux
03a109e446
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-20 21:31:28 +00:00
Guillaume J. Charmes
bcfe2ceffb
Remove the mtime for temp file. Prevent false negative cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-05-20 21:31:28 +00:00
Brice Jaglin
9810da853b
force the read of the tarSum so that sums actually get computed
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv> (github: bjaglin)
2014-05-20 21:31:28 +00:00
Michael Crosby
70d35b9d39
Merge pull request #5918 from crosbymichael/volumes-commit
...
Do not commit host bind mounts into image
2014-05-20 14:28:49 -07:00
Tianon Gravi
d98af1236c
Update gorilla/mux, gorilla/context, and kr/pty deps
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-20 15:23:50 -06:00
Michael Crosby
e2d79bec3a
Update runconfig unit test for changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-20 21:11:33 +00:00
Tianon Gravi
a16cb394fa
Merge pull request #5945 from crosbymichael/lxc-version-bump
...
Update LXC requirement to 1.0
2014-05-20 14:54:24 -06:00
Michael Crosby
94f01184be
Update lxc requirement to 1.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-20 20:45:22 +00:00