effc835e97
Merge pull request #5092 from LK4D4/timestamp_for_docker_logs_#1165
...
Timestamps for docker logs.
Upstream-commit: c42db412b69be4f81319561e20923cf786c84a5d
Component: engine
2014-05-01 10:32:34 -07:00
6a260a1e42
Timestamps for docker logs.
...
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: d1297feef8b124e69efc99a58294f498ecb8c022
Component: engine
2014-05-01 20:40:36 +04:00
8195178553
Merge pull request #5519 from SvenDowideit/remove-rst-docs
...
remove rst/sphinx documentation
Upstream-commit: 51a39563fa31ddde9742b9e8a9b847b7c0307c73
Component: engine
2014-05-01 16:33:54 +03:00
2ce48c01a4
Merge pull request #5516 from SvenDowideit/docs-meta-rendering
...
add page_description and page_keywords md meta to mkdocs html template
Upstream-commit: c52bb90d037d7be4623df923582a12f41cb91820
Component: engine
2014-05-01 16:16:48 +03:00
549ce4c50e
remove rst/sphinx documentation
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: adf04681b4bd7293675b77b2397d87a5361b383b
Component: engine
2014-05-01 15:31:58 +10:00
99009c27fd
add page_description and page_keywords md meta to mkdocs html template
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 8ae53ef167d684ed41fd9bd1a04f7a70a1ad20b6
Component: engine
2014-05-01 12:41:57 +10:00
e7b52bc191
Merge pull request #5514 from vbatts/vbatts-save_typo
...
docker save: typo reference image, not container
Upstream-commit: 9da75eb4df082ce0be68cab55b862f817c73166b
Component: engine
2014-04-30 19:00:22 -07:00
c808aa7e58
docker save: typo reference image, not container
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 93f8e277de63b4bcf6dc82b8c4b7abf81d614355
Component: engine
2014-04-30 21:51:03 -04:00
3c350a7bfd
Merge pull request #5511 from crosbymichael/refactor-libcontainer
...
Refactor: remove statewriter type and all callback for process start
Upstream-commit: 26ac05c8bce47fd37c35e43b98cdbcfb65a5c9bb
Component: engine
2014-04-30 16:50:57 -07:00
47e64912c0
Merge pull request #5512 from crosbymichael/set-freezer
...
Add ability to set cgroups freezer
Upstream-commit: be013c7820747af5e3696ad306b817aa437dd3c4
Component: engine
2014-04-30 16:50:01 -07:00
4188748bd6
Add ability to set cgroups freezer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5f6fda8cfd05dec002894d3e2214a04a58b62bed
Component: engine
2014-04-30 16:07:12 -07:00
e0c447076a
Remove statewriter interface, export more libcontainer funcs
...
This temp. expands the Exec method's signature but adds a more robust
way to know when the container's process is actually released and begins
to run. The network interfaces are not guaranteed to be up yet but this
provides a more accurate view with a single callback at this time.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f1104014372e71e1f8ae7a63d17e18de5e2fa93a
Component: engine
2014-04-30 15:52:40 -07:00
c5e3da18ab
Export SetupUser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cd8cec854be33a74179618864cd528acf5129cd9
Component: engine
2014-04-30 15:27:59 -07:00
26fc4488a8
Remove logger from nsinit struct
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 162dafbcd5c4d57c7f436e11d90423ee6d7c3ce1
Component: engine
2014-04-30 15:24:18 -07:00
2bc0a4b67c
Merge pull request #5498 from tianon/better-apparmor-missing-error
...
Upstream-commit: bfedf247a46acc6deceeaef5703b76026691d42b
Component: engine
2014-04-30 15:16:43 -07:00
87fcb82bfa
Merge pull request #5448 from crosbymichael/selinux-defaults
...
Add selinux label support for processes and mount
Upstream-commit: 2a711d16e05b69328f2636f88f8eac035477f7e4
Component: engine
2014-04-30 14:14:39 -07:00
6835a0cd51
Merge pull request #5506 from crosbymichael/add-system-maintainer
...
Add system maintainers
Upstream-commit: 2fc5bed61d14d22a5d50afc5416c87930c5fbd96
Component: engine
2014-04-30 14:14:21 -07:00
bf18e83e5d
Merge pull request #5464 from tianon/close-leftover-fds
...
Upstream-commit: e88ef454b7a8705570623e6d26f51731b8300e0f
Component: engine
2014-04-30 12:27:52 -07:00
b55f9defa8
Add system maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6203d8b462ee9dbc42b651ac8b6b2d83b9eef963
Component: engine
2014-04-30 12:01:06 -07:00
91ec6d65ce
Merge pull request #5502 from tianon/remove-contrib-zfs
...
Remove contrib/zfs directory
Upstream-commit: f5e5777e6359378261b176708dfe4f1853f93814
Component: engine
2014-04-30 11:03:13 -07:00
5ce64c0f94
Remove contrib/zfs directory
...
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0037dc8d60bc22e34838e15efaa1041ea2826c2c
Component: engine
2014-04-30 11:56:14 -06:00
b9c2a63b00
Merge pull request #5500 from tianon/fix-maintainers-format
...
Fix various MAINTAINERS format inconsistencies
Upstream-commit: e8f8f1c72963e1c9511ea6aedcd8a1f53c5da277
Component: engine
2014-04-30 10:55:45 -07:00
bde45636d6
Fix various MAINTAINERS format inconsistencies
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
c760729220
Merge branch 'pr-5353'
...
Upstream-commit: 0c5375146a6881d3a093523c2422b29679387743
Component: engine
2014-04-30 02:10:53 -07:00
23a6b19cdc
beam: Add more tests to unix_test.go
...
These are failing, and indicate things that need to be fixed. The
primarily problem is the lack of framing between beam messages.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
[solomon@docker.com: rebased on master]
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: e802b69146ac7a008d943a3a289fba56150b4f81
Component: engine
2014-04-30 02:10:09 -07:00
bbcaf9ab18
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 494c789ac34d3f22d5f6275937155e0aa2647374
Component: engine
2014-04-30 02:10:09 -07:00
25c14cce30
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 9e2e26c69a52c0b55d31de477a652731f87b4558
Component: engine
2014-04-30 02:10:09 -07:00
2256dd9cdf
Update pkg/apparmor to provide a better error message when apparmor_parser cannot be found
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a1a9baf926ff8ec2bd7ba0dd39cf3a9eb5fab1d3
Component: engine
2014-04-29 23:19:21 -06:00
659a79c68f
Merge pull request #5484 from vmarmol/add-test-unit
...
Add new test-unit make rule which only runs the unit tests
Upstream-commit: 70b56529847cf0c1fa58e5060c2a471701801f98
Component: engine
2014-04-29 23:15:16 -06:00
daed0fd4e2
Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
...
for want of a comma, the kingdom was lost
Upstream-commit: 48388b81787dcae4ce13dc75277c3209bbb258a1
Component: engine
2014-04-29 22:28:59 -04:00
760aa19df4
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
...
Upstream-commit: 20e9f61971a858baef1c8035f5f08ceefdc7c92d
Component: engine
2014-04-29 17:41:16 -07:00
6630e05dd5
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ebaff50bd2c94f2353f4bd738e077c7baef3e879
Component: engine
2014-04-30 10:12:21 +10:00
79d31745eb
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
614fad87b9
Close extraneous file descriptors in containers
...
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)
Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d5d62ff95574a48816890d8d6e0785a79f559c3c
Component: engine
2014-04-29 16:45:28 -06:00
55792f63be
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
Upstream-commit: a96cac4d7d42db757f9387ff1352ebedfc7b557e
Component: engine
2014-04-29 16:40:40 -06:00
1c4e288ba8
Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
...
Docs/CSS: Amend code block rendering.
Upstream-commit: 34a3d41d17a3f7090680b2f240a540c40184c573
Component: engine
2014-04-30 00:45:04 +03:00
4478918ea3
Merge pull request #5460 from tianon/no-pull-scratch
...
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Upstream-commit: 2c85468753509c442a675d79de0e65476468c453
Component: engine
2014-04-29 14:37:06 -07:00
f3278d6d2b
Merge pull request #5478 from amangoel/patch-1
...
Update working-with-docker.md
Upstream-commit: 473b7a6c93c37506583169c4476ea341f0d96507
Component: engine
2014-04-30 00:00:14 +03:00
f54d99728b
Add a TESTDIRS variable to the test bundle to allow for the running of a
...
single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
dd5d56fcd2
Update working-with-docker.md
...
Upstream-commit: 83a5f2a192f4c8bb87e9cbd80df42a0496615a1a
Component: engine
2014-04-29 13:49:36 -07:00
f36305e10a
Merge pull request #5475 from srijs/patch-1
...
docs: DisableNetwork -> NetworkDisabled
Upstream-commit: 1bc0f82406692655cfeb6467ebf24328e2d17603
Component: engine
2014-04-29 23:43:28 +03:00
fdcad5e0a4
Merge pull request #5476 from rjnagal/libcontainer-fixes
...
Cleanup cgroups on Set failures
Upstream-commit: bf59e6723274c6d20d7c78c683b5c8923a6d910e
Component: engine
2014-04-29 12:27:31 -07:00
20591f6a0e
docs: DisableNetwork -> NetworkDisabled
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 9651ff46bfc19b815e3f78bc5d6895a352db2d37
Component: engine
2014-04-29 21:18:26 +02:00
64742bd4a0
Merge pull request #5474 from crosbymichael/use-proper-scheme
...
Use proper scheme with static registry
Upstream-commit: 9d4771760af5326a2fff2e0bc091743331753253
Component: engine
2014-04-29 12:04:49 -07:00
3267a2a3bd
Cleanup existing controllers when cleanup fails mid-way.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: 070747a21365959d3179d8df627d3e614318e202
Component: engine
2014-04-29 18:59:20 +00:00
119b7b20d7
Merge pull request #4607 from vbatts/vbatts-static_registry
...
static registry support
Upstream-commit: 8a5060dba47ef9d91470c16e8ec3a9db59e60695
Component: engine
2014-04-29 11:22:44 -07:00
a55ecec598
Add mountlabel to dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0c7143b32386c62cccd529de69abf88df938757d
Component: engine
2014-04-29 03:41:44 -07:00
620a842b2b
Do not return labels when in privileged mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1a5ffef6c6ea8c5cc31c298bbdf6f7a29c60fbb8
Component: engine
2014-04-29 03:40:06 -07:00
20f9d39967
Add cli flag to docs for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 64d0f7e39b395a3fc52f441a53f188a19bd53cf3
Component: engine
2014-04-29 03:40:06 -07:00
b1dafd91c1
Update process labels to be set at create not start
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 46e05ed2d96efca9bdb466d20138fde1994769ba
Component: engine
2014-04-29 03:40:05 -07:00
