ba77c9041d
refactor(libcontainer): rename to CapabilitiesMask
...
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 128381e0f0372f10f88a847087aa91a972770c4b
Component: engine
2014-03-17 11:07:12 -07:00
2684bc55f2
Merge pull request #4698 from rutsky/external_link_in_rst_fix
...
Fix external link on security of containers
Upstream-commit: 2ea3fa9af5884cbf024f381e2a089c4e32b8494d
Component: engine
2014-03-17 09:29:33 +10:00
cb5ab8e061
Fix external link on security of containers
...
Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com > (github: rutsky)
Upstream-commit: 65051f4215e493928a211c411f775ee1cc7a763f
Component: engine
2014-03-16 18:36:15 +04:00
95a0f40b26
Merge pull request #4687 from zqhxuyuan/patch-1
...
Update epel.rpm's new url
Upstream-commit: 7a7126faf641aec413add78f5e15e5febb280302
Component: engine
2014-03-16 08:14:18 +10:00
8e25e532b5
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject ....
Upstream-commit: 853c5e258fc9a3d8420e62aaed4817179073610a
Component: engine
2014-03-16 01:07:22 +08:00
3ace596568
Merge pull request #4676 from crosbymichael/no-sig-kill
...
Send sigterm to child instead of sigkill
Upstream-commit: f9090567af360c37b5d3f3811834a8de3ac0e06d
Component: engine
2014-03-14 16:44:08 -07:00
76b94861e7
Add Sam's Go "dockerclient" to the list of Client Libraries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ba0861ad359477ad81346a81f1bac09cb5e2eb2
Component: engine
2014-03-14 17:20:22 -06:00
de094b3b6d
Merge pull request #4673 from vieux/update_test_TestCreateRmRunning
...
update TestCreateRmRunning
Upstream-commit: 75738b8527f7578f8a18696bc6b49961790414cd
Component: engine
2014-03-14 15:50:27 -07:00
6e363c4ca9
Merge pull request #4679 from metalivedev/updateimages
...
Update images to remove references to AUFS, LXC
Upstream-commit: 5fd2de979290e5a9261b67ffa4d9a895a40563fe
Component: engine
2014-03-15 08:45:37 +10:00
842270ca38
Send sigterm to child instead of sigkill
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 39037a91f85a4a072e5aa7e585d8c2f6b211df8a
Component: engine
2014-03-14 15:42:05 -07:00
567bf7e304
Add parent reference arrow.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 8c2cbfa0963e953cf75fe09ec688a6125689cc6d
Component: engine
2014-03-14 14:48:13 -07:00
636cbb42ab
Updating base svg to remove references to aufs and lxc.
...
Exported new png's from layers.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 50b12708e35c300d93e8f8e8d21f79101fc185d3
Component: engine
2014-03-14 14:37:09 -07:00
6da37c5cc7
Merge pull request #4647 from vieux/fix_registry_tests
...
use mock for search
Upstream-commit: 6a058540fe0872b96180c3e302f33435ddae5f36
Component: engine
2014-03-14 14:34:44 -07:00
f8a7f0e2ba
Merge pull request #4593 from crosbymichael/move-server
...
Move server and buildfile into server pkg
Upstream-commit: 2c10fcc432f8a541aac2c7feb1a453cfc16e4d0b
Component: engine
2014-03-14 22:51:50 +02:00
294ad1e10b
update TestCreateRmRunning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 123ebf905367f1da0d9480153d08912d58b721fc
Component: engine
2014-03-14 18:16:14 +00:00
e71ba07505
Update integration tests for server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8cf0b80a7843633018b66a35d9a55f30814a56b6
Component: engine
2014-03-14 09:46:56 -07:00
d7147519fc
Move server and buildfile into server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5239aa1f11c32f3befc25fb2fa8a0ecf75ec4bf6
Component: engine
2014-03-14 09:37:08 -07:00
a7c2cbac56
Merge pull request #4660 from vieux/parsecommand
...
create the cli obj before calling parseCommand
Upstream-commit: 5c6d54073f045d70c961245aee26455deac86177
Component: engine
2014-03-14 17:36:40 +02:00
19c6fcaf73
Merge pull request #4653 from creack/fix_expose_cache
...
Fix expose cache
Upstream-commit: 28a9ff7f2557d88174b46482a5b402c511684cf7
Component: engine
2014-03-14 16:09:13 +02:00
ee321aa23e
Merge pull request #4664 from tianon/fix-sphinx-warnings
...
Fix sphinx warnings
Upstream-commit: e1c54f6cb96f75898ed7c4c8aef2389cb005eb47
Component: engine
2014-03-14 09:21:44 -04:00
ef717aa91c
Make sphinx warnings fatal in Travis
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ae47f709ca6a6c29b769191ceabb10e59a0408b1
Component: engine
2014-03-13 22:35:31 -06:00
b7e9a63083
Fix sphinx header underline warnings I introduced...
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f6efcf20943e656ca977f1fd0ae5197f5757dff4
Component: engine
2014-03-13 22:35:09 -06:00
5a2ca94673
create the cli obj before calling parseCommand
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c349c9d14a1c4bf04f35f3f5c62b0bb92614bc81
Component: engine
2014-03-14 00:47:13 +00:00
0795e31f12
Merge pull request #4659 from creack/more_info
...
Have the exec driver and kernel version in non-debug mode in `docker info`
Upstream-commit: 9c21a73f7449e412e101ba688459a26137f2c50d
Component: engine
2014-03-13 17:32:42 -07:00
b61f94b205
Merge pull request #4633 from crosbymichael/no-pid-kill
...
Don't kill by pid for other drivers
Upstream-commit: 400ae98d23f0fb70555b73f0dffa651f185999b4
Component: engine
2014-03-13 17:31:37 -07:00
5c034565db
Add unit test for expose cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 7b89af2a08b65fac064603cb3b5eb8e091e2c076
Component: engine
2014-03-13 17:06:17 -07:00
4eb4057922
Have the exec driver and kernel version in non-debug mode in docker info
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 6411ee6d24d256e15909ea68b845b354dc51c4ed
Component: engine
2014-03-13 16:28:16 -07:00
fa769864c8
Merge pull request #4658 from vieux/fix_display_build
...
fix build output
Upstream-commit: c0cef47b1e77c5527df3dd7abc7d3c51416befb5
Component: engine
2014-03-13 15:34:17 -07:00
1962352375
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
Upstream-commit: 212a870734b5be597579e59bfb8758c3b3198144
Component: engine
2014-03-13 15:31:14 -07:00
abbecb8a25
as you could have multiple messages per line with streams, don't \r
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 03f0ec35ae31420dd6a56883535056087b1a75dd
Component: engine
2014-03-13 22:26:42 +00:00
cefa586dcf
Merge pull request #4657 from crosbymichael/update-libcontainer-docs
...
Update libcontainer readme and todo list
Upstream-commit: f88f232f5341952acd05165da16bbd8b6649155d
Component: engine
2014-03-13 15:19:29 -07:00
0e6df3669c
Update libcontainer readme and todo list
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cbd2a30cd6185d1469f82f8b6693d6158c93d54a
Component: engine
2014-03-13 15:18:08 -07:00
0fda3b88ac
Don't kill by pid for other drivers
...
Closes #4575
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3fa99b35b05d9159d6f7f4c7465dec747da2c4e1
Component: engine
2014-03-13 15:04:23 -07:00
1080c0f16b
Merge pull request #4656 from crosbymichael/fix-ptmx-link
...
Always symlink /dev/ptmx for libcontainer
Upstream-commit: 28994f86eef11074f613433893ef345321afef91
Component: engine
2014-03-13 14:57:17 -07:00
596209d4bb
Merge pull request #4422 from alexlarsson/internal-mounts
...
Move all bind-mounts in the container inside the namespace
Upstream-commit: c7ea6e5da80af3d9ba7558f876efbf0801d988d8
Component: engine
2014-03-13 14:55:29 -07:00
75217fbf0a
Always symlink /dev/ptmx for libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 747275d30c4d4eb25ca798394cc04db00912adb2
Component: engine
2014-03-13 14:31:09 -07:00
0238b3e45c
Merge pull request #4624 from creack/fix_apparmor_init
...
Fix issue when /etc/apparmor.d does not exists
Upstream-commit: 192917a1cbfd325cd4d141d76703a3ccfd6e60e7
Component: engine
2014-03-13 14:04:13 -07:00
c733b13d1a
Fix EXPOSE cache miss issue
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: ab26c16b32420011b0aee3de1a3bce5a0afd6f4d
Component: engine
2014-03-13 13:58:09 -07:00
bf4d876000
Merge pull request #4649 from cglewis/release_add_breakathon
...
Add a "breakathon" for a testing/QA period to the release checklist
Upstream-commit: af5892384744b4d372e2865d7cd89e3981c15c1a
Component: engine
2014-03-13 13:43:37 -06:00
47228d6a8c
add a breakathon for testing
...
Docker-DCO-1.1-Signed-off-by: Charlie Lewis <charliel@lab41.org > (github: cglewis)
Upstream-commit: 6fc83eefd9e8d78044a51250d2ad185513fddd27
Component: engine
2014-03-13 12:39:24 -07:00
f50f7dffd9
Merge pull request #4648 from creack/fix_raw_mode_darwin
...
Use BSD raw mode on darwin. Fixes nano, tmux and others
Upstream-commit: 89d2e14ed0e76bfd72c196c6190fbe9afce6a789
Component: engine
2014-03-13 12:15:50 -07:00
7a46914030
Don't use separate bind mount for container
...
Since we're not not mounting anything but the base filesystem outside
the container we no longer need the separate bind mount at
/var/lib/docker/container/$id/root in order to see the base filesystem
without extra mounts. So, we drop this and mount (again) the container
root directly at the real basefs mountpoint.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bf1b27dfcc6c4e049706d7d104e1abc5c330815d
Component: engine
2014-03-13 20:08:29 +01:00
746b307c72
Move all bind-mounts in the container inside the namespace
...
This moves the bind mounts like /.dockerinit, /etc/hostname, volumes,
etc into the container namespace, by setting them up using lxc.
This is useful to avoid littering the global namespace with a lot of
mounts that are internal to each container and are not generally
needed on the outside. In particular, it seems that having a lot of
mounts is problematic wrt scaling to a lot of containers on systems
where the root filesystem is mounted --rshared.
Note that the "private" option is only supported by the native driver, as
lxc doesn't support setting this. This is not a huge problem, but it does
mean that some mounts are unnecessarily shared inside the container if you're
using the lxc driver.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 6c266c4b42eeabe2d433a994753d86637fe52a0b
Component: engine
2014-03-13 20:01:29 +01:00
1cf50c0291
Move .dockerenv parsing to lxc driver
...
This is not needed for e.g. the native driver
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 636959e20ae368e470a5c2420aae4528245b2cf6
Component: engine
2014-03-13 20:01:29 +01:00
5a323c5f4c
Use BSD raw mode on darwin. Fixes nano, tmux and others
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 029aac96396f5a9d76adf5e4675d27321273dfbd
Component: engine
2014-03-13 11:11:02 -07:00
7f79b8abd6
Merge pull request #4387 from unclejack/multiple_metadata_retrieval_attempts
...
retry to retrieve layer metadata on failure during pull
Upstream-commit: 6ac6619a1ed52cbc1c0d8661c2cc40e9166fb989
Component: engine
2014-03-13 11:03:52 -07:00
c48adc6929
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
f7f8c4ef4e
use mock for search
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9a0d7fe0182da541cc99eab9a4930616792e95c3
Component: engine
2014-03-13 17:40:34 +00:00
a6f4cbe233
Merge pull request #4638 from ichik1/cli-doc-minor-fix
...
Some minor fixes for cli docs
Upstream-commit: 51a46e6a4ff74d74307341593208285d61592608
Component: engine
2014-03-13 20:11:10 +10:00
6577c881e6
Merge pull request #4636 from phillipalexander/fix-license
...
Fix boilerplate text in Apache license
Upstream-commit: 0e871edfeb446528616f425335570ffd5676e256
Component: engine
2014-03-13 02:42:56 -04:00
