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
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
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
b7f9e683c3
Merge pull request #5958 from erikh/5738-docker_port_in_use
...
docker port in use
2014-05-21 21:06:27 +00:00
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
8e967fe802
Revert "Always mount a /run tmpfs in the container"
...
This reverts commit 905795ece6
2014-05-21 14:28:19 -06:00
2ff4f71528
Merge pull request #5953 from tiborvass/remove-chmod-755
...
remove chmod 755: fixes #5941
2014-05-21 12:27:06 -07:00
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
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
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
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
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
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
51f707cf9d
Add deprecation warnings to the mkimage scripts that are have consolidated mkimage implementations
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-21 09:58:11 -06:00
7e42505083
Add new consolidated mkimage scripts
...
These new scripts are streamlined such that, for example, "contrib/mkimage/debootstrap" is _only_ responsible for filling a directory with the results of running debootstrap, and it can accept any arbitrary arguments.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-21 09:47:36 -06:00
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
a94a87778c
Merge pull request #5954 from vieux/fix_cp_error
...
Ignore lchown error on docker cp
2014-05-21 15:55:57 +03:00
cfe7211a22
man/docker-run.1: Fix typo 'priviledged', add missing closing brackets
...
Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org> (github: cgwalters)
2014-05-21 07:00:38 -04:00
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
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
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
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
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
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
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
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
83e9dc7200
Merge pull request #5755 from vieux/move_inspect_daemon
...
move inspect from server to daemon
2014-05-20 15:50:38 -07:00
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
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
240fad4974
Merge pull request #5951 from vieux/pr5919
...
Fix remote add cache
2014-05-20 14:33:05 -07:00
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
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
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
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
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
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
a16cb394fa
Merge pull request #5945 from crosbymichael/lxc-version-bump
...
Update LXC requirement to 1.0
2014-05-20 14:54:24 -06:00
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
f915988a5d
Merge pull request #5916 from rhatdan/crash
...
docker '' causes a golang crash.
2014-05-20 13:42:48 -07:00
603e00a3a7
move inspect from server to daemon
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-20 19:36:15 +00:00
24c73ce2d3
Fix race condition during socket creation
...
Docker-DCO-1.1-Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> (github: glebfm)
2014-05-20 23:22:06 +04:00
0f27894094
Fix network mode for lxc 1.0
...
Fixes #5692
This change requires lxc 1.0+ to work and breaks lxc versions less than
1.0 for host networking. We think that this is a find tradeoff by
bumping docker to only support lxc 1.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-20 19:10:23 +00:00
bc081a03d8
docker '' causes a golang crash.
...
This patch fixes the problem.
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-20 14:04:27 -04:00
e5202de918
Merge pull request #5930 from alexlarsson/add-cap-setfcap
...
native driver: Don't drop SETFCAP
2014-05-20 10:29:37 -07:00
f3edb7c0e8
Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod
...
cgroups: Allow mknod for any device in systemd cgroup backend
2014-05-20 10:13:13 -07:00
47aa9f5a0e
Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
...
Wait for pidfile to exist when starting with RedHat init script
2014-05-20 10:25:03 -06:00
fcf2e9a910
native driver: Add required capabilities
...
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928
We also need SETPCAP, for instance systemd needs this to set caps
on its childen.
Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.
We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-20 11:31:39 +02:00
6029504350
cgroups: Allow mknod for any device in systemd cgroup backend
...
Without this any container startup fails:
2014/05/20 09:20:36 setup mount namespace copy additional dev nodes mknod fuse operation not permitted
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-20 09:29:32 +02:00
000a37fe9d
fix(daemon): prepend host /etc/hosts instead of bind mounting
...
systemd systems do not require a /etc/hosts file exists since an nss
module is shipped that creates localhost implicitly. So, mounting
/etc/hosts can fail on these sorts of systems, as was reported on CoreOS
in issue #5812 .
Instead of trying to bind mount just copy the hosts entries onto the
containers private /etc/hosts.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-05-19 22:32:51 -07:00
bfe72c6189
Merge pull request #5920 from jmccrohan/master
...
docs: cli.md; document docker version output
2014-05-19 21:41:05 -07:00
Dan Walsh
Michael Crosby
James Turnbull
Victor Vieux
Tianon Gravi
Michael Crosby
Tibor Vass
Erik Hollensbe
Brian Goff
unclejack
Colin Walters
tpng
AnandkumarPatel
Victor Vieux
Guillaume J. Charmes
Brice Jaglin
Gleb Fotengauer-Malinovskiy
Alexander Larsson
Brandon Philips
Sven Dowideit