37f08c7066
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)
Upstream-commit: f042c3c15759fce5cc139f2b3362b791ac7d4829
Component: engine
2014-05-21 00:40:41 +00:00
34fdbfe296
Update documentation for container struct in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ed5892ed4efa995950e2fdeb5fd718b3bb1aa1c2
Component: engine
2014-05-20 23:34:46 +00:00
ada6c057b6
Mount /dev in tmpfs for privileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 34c05c58c8d41ee2bb02cd8059e9928ee2f061ea
Component: engine
2014-05-20 22:51:24 +00:00
b9dbdb7d9e
Merge pull request #5755 from vieux/move_inspect_daemon
...
move inspect from server to daemon
Upstream-commit: 83e9dc720039cfa8685b8dc59f76ca2f1e9489d2
Component: engine
2014-05-20 15:50:38 -07:00
d7176ddd5c
Merge pull request #5950 from tianon/update-deps
...
Update gorilla/mux, gorilla/context, and kr/pty deps
Upstream-commit: 1f219672fad7421d5c72ec4990ce2446e9155457
Component: engine
2014-05-20 16:16:21 -06:00
c9d0eafbf0
Merge pull request #5946 from crosbymichael/lxc-host-net
...
Fix network mode for lxc 1.0
Upstream-commit: 1310243d488cfede2f5765e79b01ab20efd46cc0
Component: engine
2014-05-20 14:51:33 -07:00
45b3b14782
Merge pull request #5951 from vieux/pr5919
...
Fix remote add cache
Upstream-commit: 240fad497415d798fcaef6dcd8d1231f93a4887c
Component: engine
2014-05-20 14:33:05 -07:00
83451c4f0a
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 03a109e446351ba40ea5d74e8eb6733b2a9a5045
Component: engine
2014-05-20 21:31:28 +00:00
9c8b2dfbeb
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)
Upstream-commit: bcfe2ceffb1c4c7006570d4ba21ed2068bb448a1
Component: engine
2014-05-20 21:31:28 +00:00
76507afd3a
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)
Upstream-commit: 9810da853bd890b6c963017555c3555ef9e0d842
Component: engine
2014-05-20 21:31:28 +00:00
61e4bbbc1b
Merge pull request #5918 from crosbymichael/volumes-commit
...
Do not commit host bind mounts into image
Upstream-commit: 70d35b9d39239fa14bea0bc462ff71c17570c93d
Component: engine
2014-05-20 14:28:49 -07:00
2fdc01b488
Update gorilla/mux, gorilla/context, and kr/pty deps
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d98af1236c9aeef6f9eef34970e13cbe0ea06ff8
Component: engine
2014-05-20 15:23:50 -06:00
aad71a085e
Update runconfig unit test for changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e2d79bec3ab76357625ca57d83299012f584c024
Component: engine
2014-05-20 21:11:33 +00:00
f91b76d592
Merge pull request #5945 from crosbymichael/lxc-version-bump
...
Update LXC requirement to 1.0
Upstream-commit: a16cb394fa4ea2c1d4241f184d23380d5b2c9fa0
Component: engine
2014-05-20 14:54:24 -06:00
5d70d92ff7
Update lxc requirement to 1.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 94f01184beb731b8c28dd43cf259621ba14f76ff
Component: engine
2014-05-20 20:45:22 +00:00
03422490ae
Merge pull request #5916 from rhatdan/crash
...
docker '' causes a golang crash.
Upstream-commit: f915988a5d089905b0fd6eb4f472c331569bb079
Component: engine
2014-05-20 13:42:48 -07:00
74d86a8d61
move inspect from server to daemon
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
2014-05-20 19:36:15 +00:00
417fd6d53a
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)
Upstream-commit: 0f278940947d74f2b7889ada18808779312f9608
Component: engine
2014-05-20 19:10:23 +00:00
df1cb6f1b5
docker '' causes a golang crash.
...
This patch fixes the problem.
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: bc081a03d85a88cc2160ade9256d96d7b84c4caa
Component: engine
2014-05-20 14:04:27 -04:00
ae6d266785
Merge pull request #5930 from alexlarsson/add-cap-setfcap
...
native driver: Don't drop SETFCAP
Upstream-commit: e5202de9186a2548c54af54739a6cb09046afd61
Component: engine
2014-05-20 10:29:37 -07:00
2c2ee20fef
Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod
...
cgroups: Allow mknod for any device in systemd cgroup backend
Upstream-commit: f3edb7c0e8197d1573ec3bfa058ed498ebeca2e7
Component: engine
2014-05-20 10:13:13 -07:00
91009e208d
Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
...
Wait for pidfile to exist when starting with RedHat init script
Upstream-commit: 47aa9f5a0e38f395cee7517720f8a80587bb911b
Component: engine
2014-05-20 10:25:03 -06:00
da7177cbfd
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)
Upstream-commit: fcf2e9a9107c6c9aebaf63ce044f636333e7eed8
Component: engine
2014-05-20 11:31:39 +02:00
d043d726b2
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)
Upstream-commit: 602950435056baa939f428223b6d3ff26ca5403d
Component: engine
2014-05-20 09:29:32 +02:00
457c223488
Merge pull request #5920 from jmccrohan/master
...
docs: cli.md; document docker version output
Upstream-commit: bfe72c6189e92d9ee6f2d2f26a5553b4eb863a44
Component: engine
2014-05-19 21:41:05 -07:00
7428c89c95
docs: cli.md; document docker version output
...
Commit 3cec63d56f9de6332aa3f33502695283d4feb054 changed the output of
docker version. Updating docs accordingly.
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com > (github: jmccrohan)
Upstream-commit: 4052a81830e57c9f1d7d567ba9e53813945c9810
Component: engine
2014-05-20 02:00:31 +01:00
77c39f7b85
Merge pull request #5905 from jamtur01/faq
...
Adding the FAQ back
Upstream-commit: 5511be75127b84933d0f283b21dbd05a1b6edc33
Component: engine
2014-05-20 10:17:01 +10:00
446a0e28d3
Add test for commiting container with bind mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d31c37fceb6c09a48b5dd9d6c33a95d734e02704
Component: engine
2014-05-19 22:57:29 +00:00
4d767cc66f
Merge pull request #5890 from LK4D4/fix_tee_hanging_on_test_fails_#5672
...
Fix hanging on tests failing
Upstream-commit: 05c3325a02bf2ffee660dcfd36e8d34cb7192b51
Component: engine
2014-05-19 16:37:19 -06:00
2c620b9486
Don't save bind mounts in image
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d535d9810012b18ca83f86aa416ff4a08bb49804
Component: engine
2014-05-19 22:18:37 +00:00
09f949815a
Move init volumes code to func
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e454be7567e144dc836ff283d4f4e059db307a91
Component: engine
2014-05-19 22:04:51 +00:00
cd508fe398
Merge pull request #5915 from vieux/start_remove_link
...
starts by removing the name from the graph db
Upstream-commit: b5d0bdc9e8f651848b1be2347cedc894dd470e64
Component: engine
2014-05-19 14:38:55 -07:00
062e6435f7
Merge pull request #5913 from crosbymichael/fuse
...
Make sure dev/fuse is created in container
Upstream-commit: 2d1c2456313d66f3f0ac42d4dc2d307c0fc457c3
Component: engine
2014-05-19 14:31:32 -07:00
27fffbebb6
starts by removing the name from the graph db
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: c12dd770908acc06ab402840ad7736e0c056b567
Component: engine
2014-05-19 21:22:33 +00:00
bf729dca8b
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)
Upstream-commit: 599cb12bb8aa13aa2f1be940dd8de4c9d3a06959
Component: engine
2014-05-19 23:55:28 +03:00
9b9e25f1db
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)
Upstream-commit: a87bcefb8bf0cee47bf114a46fc33708ce843208
Component: engine
2014-05-19 20:46:59 +00:00
25d692e3fa
Merge pull request #5911 from LK4D4/chmod_on_add_#3979
...
Make chmod on ADDed files
Upstream-commit: 5fee3774d4c68fa6ec1e330575b1f6edfb71dc6f
Component: engine
2014-05-19 13:35:55 -07:00
20387c224e
Make chmod on ADDed files
...
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 620c8c72535670e8358cebc65a2fb424be58a93c
Component: engine
2014-05-20 00:09:39 +04:00
4bebb62399
Merge pull request #5903 from alexlarsson/writable-proc
...
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
Upstream-commit: 30bd2bbc83b746a1d4527a5c57363bcb9bab34d6
Component: engine
2014-05-19 12:21:15 -07:00
494e36141b
Merge pull request #5861 from crquan/fix-user-agent-trailing-space
...
Remove Trailing Whitespace in User-Agent
Upstream-commit: d74b6095c9ca8b51e5ea8edcfba4ab03dad86f05
Component: engine
2014-05-19 12:08:53 -07:00
14c75e39a9
Merge pull request #5869 from vbatts/vbatts-vendor-capabilities
...
gocapability: upstream fix for unsporrted caps
Upstream-commit: b2275ee8dfe6fae888878a989efe6312b2a4f6a2
Component: engine
2014-05-19 12:08:12 -07:00
c117ccdc5a
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)
Upstream-commit: 68493e2f7f9cb8303302e1098e3293b521ace243
Component: engine
2014-05-19 20:46:05 +02:00
7c9fae616c
Merge pull request #5879 from timthelion/docs-sysinit-readme
...
Add README.md file for sysinit directory
Upstream-commit: ccf29f0b94274e7052c24a2fc0e0ffc2263a743b
Component: engine
2014-05-19 11:26:22 -07:00
500aeb9329
Merge pull request #5875 from timthelion/docs-archive-readme
...
Add readme file for the archive directory
Upstream-commit: 7fb5ce44a08a7b41bb641ee89e0baea325d9597a
Component: engine
2014-05-19 11:25:55 -07:00
adb5b13fc3
Merge pull request #5792 from bernerdschaefer/nsinit-supports-pdeathsig
...
Add PDEATHSIG support to nsinit library
Upstream-commit: cb7680b9b919fdc845a857fafc52178c656cf5be
Component: engine
2014-05-19 11:13:23 -07:00
854833443c
Merge pull request #5871 from unclejack/speed_up_buildsixtysteps
...
integcli: speed up TestBuildSixtySteps
Upstream-commit: 8674ec7f757807a8df6b9980aa62c18499c39d9f
Component: engine
2014-05-19 11:02:36 -07:00
15e0b23213
Merge pull request #5876 from timthelion/docs-daemon-readme
...
Add readme for daemon directory
Upstream-commit: 40c8fc668c5e8aa4d74d6fa3c7c27a22cd45438c
Component: engine
2014-05-19 10:51:17 -07:00
81325c1851
Merge pull request #5877 from timthelion/docs-daemon-config-readme
...
Add readme for the daemonconfig directory
Upstream-commit: 5690e0355399f25addc6d8561222e1e7c23e9122
Component: engine
2014-05-19 10:50:51 -07:00
44cdecc9bf
Merge pull request #5874 from timthelion/docs-api-readme
...
Add readme file for the api directory
Upstream-commit: 3fa96c55e3e57fa6a76581bcefa63a4da1a4f2cb
Component: engine
2014-05-19 10:50:00 -07:00
f45c8a5e25
Merge pull request #5782 from unclejack/fix_5270
...
Upstream-commit: 8eef1be29e763db58a22d336b71d97c076a11199
Component: engine
2014-05-19 10:36:10 -07:00
