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
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
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
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
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
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
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
bfe72c6189
Merge pull request #5920 from jmccrohan/master
...
docs: cli.md; document docker version output
2014-05-19 21:41:05 -07:00
4052a81830
docs: cli.md; document docker version output
...
Commit 3cec63d56f
2014-05-20 02:00:31 +01:00
5511be7512
Merge pull request #5905 from jamtur01/faq
...
Adding the FAQ back
2014-05-20 10:17:01 +10:00
d31c37fceb
Add test for commiting container with bind mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-19 22:57:29 +00:00
05c3325a02
Merge pull request #5890 from LK4D4/fix_tee_hanging_on_test_fails_#5672
...
Fix hanging on tests failing
2014-05-19 16:37:19 -06:00
d535d98100
Don't save bind mounts in image
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-19 22:18:37 +00:00
e454be7567
Move init volumes code to func
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-19 22:04:51 +00:00
b5d0bdc9e8
Merge pull request #5915 from vieux/start_remove_link
...
starts by removing the name from the graph db
2014-05-19 14:38:55 -07:00
2d1c245631
Merge pull request #5913 from crosbymichael/fuse
...
Make sure dev/fuse is created in container
2014-05-19 14:31:32 -07:00
c12dd77090
starts by removing the name from the graph db
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-19 21:22:33 +00:00
b466672a4c
Merge pull request #5914 from unclejack/fix_unprivileged_user_creation
...
add unprivilegeduser via the Dockerfile
2014-05-19 14:08:06 -07:00
599cb12bb8
add unprivilegeduser via the Dockerfile
...
This changes the test TestBuildWithInaccessibleFilesInContext to not
add the user 'unprivilegeduser' and add it via the Dockerfile instead.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-19 23:55:28 +03:00
a87bcefb8b
Make sure dev/fuse is created in container
...
Fixes #5849
If the host system does not have fuse enabled in the kernel config we
will ignore the is not exist errors when trying to copy the device node
from the host system into the container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-19 20:46:59 +00:00
5fee3774d4
Merge pull request #5911 from LK4D4/chmod_on_add_#3979
...
Make chmod on ADDed files
2014-05-19 13:35:55 -07:00
620c8c7253
Make chmod on ADDed files
...
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-20 00:09:39 +04:00
30bd2bbc83
Merge pull request #5903 from alexlarsson/writable-proc
...
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
2014-05-19 12:21:15 -07:00
d74b6095c9
Merge pull request #5861 from crquan/fix-user-agent-trailing-space
...
Remove Trailing Whitespace in User-Agent
2014-05-19 12:08:53 -07:00
b2275ee8df
Merge pull request #5869 from vbatts/vbatts-vendor-capabilities
...
gocapability: upstream fix for unsporrted caps
2014-05-19 12:08:12 -07:00
68493e2f7f
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
...
Some applications want to write to /proc. For instance:
docker run -it centos groupadd foo
Gives: groupadd: failure while writing changes to /etc/group
And strace reveals why:
open("/proc/self/task/13/attr/fscreate", O_RDWR) = -1 EROFS (Read-only file system)
I've looked at what other systems do, and systemd-nspawn makes /proc read-write
and /proc/sys readonly, while lxc allows "proc:mixed" which does the same,
plus it makes /proc/sysrq-trigger also readonly.
The later seems like a prudent idea, so we follows lxc proc:mixed.
Additionally we make /proc/irq and /proc/bus, as these seem to let
you control various hardware things.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-19 20:46:05 +02:00
ccf29f0b94
Merge pull request #5879 from timthelion/docs-sysinit-readme
...
Add README.md file for sysinit directory
2014-05-19 11:26:22 -07:00
Michael Crosby
James Turnbull
Victor Vieux
Brian Goff
unclejack
AnandkumarPatel
Victor Vieux
Michael Crosby
Tianon Gravi
Guillaume J. Charmes
Brice Jaglin
Dan Walsh
Alexander Larsson
Sven Dowideit
Jonathan McCrohan
Guillaume J. Charmes
unclejack
Alexandr Morozov
Victor Marmol