858eed23c2
Update PACKAGERS.md with some text changes, including and especially moving "LXC" to a new "Optional Dependencies" section
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a7f265223aec54a53c938f119275cb5fcebca4b6
Component: engine
2014-03-04 21:25:00 -07:00
6a8f4dcad8
Merge pull request #4455 from lsm5/systemd
...
Bump container limit via systemd conf file
Upstream-commit: 6f2564350fc454b6fce19a384c4fd6272f7766b7
Component: engine
2014-03-04 20:37:16 -07:00
ecc13ba924
bump open files and procs limit via unitfile
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
modified: contrib/init/systemd/docker.service
modified: contrib/init/systemd/socket-activation/docker.service
Upstream-commit: 291d5e642e83ca84bd4f9b470eac8f840fecf48c
Component: engine
2014-03-04 22:29:51 -05:00
12a77fdca5
Merge pull request #4460 from crosbymichael/add-shm-size
...
Add shm size cap to mount
Upstream-commit: e7055830ab37998fbed61cc4e1aaab2387227b89
Component: engine
2014-03-04 14:20:20 -08:00
876978baea
Add shm size cap to mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b07708c8de5561a43060653d4d532ee0bcd6fd96
Component: engine
2014-03-04 14:18:40 -08:00
41416b3c5e
Merge pull request #4457 from creack/remove_loopback_mount
...
Remove loopback mount
Upstream-commit: 19b898ad56e238661e336a19380c710ca963f838
Component: engine
2014-03-04 17:11:37 -05:00
d5fd498efb
Remove /dev tmpfs mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 57a47f5bbfe6c82f3cce32aba96fb641f7188eee
Component: engine
2014-03-04 13:21:22 -08:00
26eb6d1e5d
remove /run mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c74a8b28cd723d6f12a54da16ff91a853958da5c
Component: engine
2014-03-04 12:32:17 -08:00
37e0bed312
Remove loopback mount bind
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 39d58129c38e8bb868a6fd9a5620837484f6d742
Component: engine
2014-03-04 12:30:52 -08:00
7aa9134dda
Merge pull request #4456 from crosbymichael/change-veth-name
...
Change veth prefix back to veth
Upstream-commit: a0c465a333b8bcd1642e8720b325eca4dd6bf2e7
Component: engine
2014-03-04 21:51:44 +02:00
d321be3c28
Change veth prefix back to veth
...
Fixes #4453
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0cdf10263844db0cb4d051ac9f79051104abe77f
Component: engine
2014-03-04 11:46:05 -08:00
96a447ef42
Merge pull request #4452 from crosbymichael/small-fixes-to-libcontainer
...
Add find tests and remove panic in DEBUG
Upstream-commit: b63709c1f1292c362dbc3d482520fb7e117605f9
Component: engine
2014-03-04 14:37:41 -05:00
a1ee3bb7ac
Merge pull request #4448 from alexlarsson/pivot_root
...
libcontainer: Use pivot_root instead of chroot
Upstream-commit: ba8d8f0abb2c5b19049b99911ff31c05b106acba
Component: engine
2014-03-04 19:59:16 +02:00
e4fda25225
Merge pull request #4418 from SvenDowideit/mention-expose-in-port-mapping-deprecation
...
make the port mapping deprecation error message more obvious
Upstream-commit: 17577a6dce6508f0c6908a678dee35eb17a5f7e3
Component: engine
2014-03-04 19:44:06 +02:00
98c6278357
Add find tests and remove panic in DEBUG
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7e52445f2f749ac66ee7734820d3558012833912
Component: engine
2014-03-04 08:55:12 -08:00
91922e3e79
Merge pull request #4438 from crosbymichael/update-docs
...
Update daemon docs for exec drivers
Upstream-commit: 20ddd34d0533ca05e3d09c5d4a8414033d69cfba
Component: engine
2014-03-04 07:56:30 -05:00
a4a84bcafe
libcontainer: Use pivot_root instead of chroot
...
Instead of keeping all the old mounts in the container namespace and
just using subtree as root we pivot_root so that the actual root in
the namespace is the root we want, and then we unmount the previous
mounts.
This has multiple advantages:
* The namespace mount tree is smaller (in the kernel)
* If you break out of the chroot you could previously access the host
filesystem. Now the host filesystem is fully invisible to the namespace.
* We get rid of all unrelated mounts from the parent namespace, which means
we don't hog these. This is important if we later switch to MS_PRIVATE instead
of MS_SLAVE as otherwise these mounts would be impossible to unmount from the
parent namespace.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5b5c884cc8266d0c2a56da0bc2df14cc9d5d85e8
Component: engine
2014-03-04 12:44:08 +01:00
5207105b8e
Merge pull request #4415 from iantruslove/patch-1
...
Fix minor typo
Upstream-commit: fbc00df7a0cc500314bd9dd5fca2fe54d011033f
Component: engine
2014-03-03 17:58:03 -08:00
84d85e3b67
Update daemon docs for exec drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0f96a749ab812d76389c4a48c71ff9a01e48488e
Component: engine
2014-03-03 17:43:08 -08:00
f917ba6a35
Merge pull request #4270 from DevTable/fixregistryauth
...
Fix registry auth and remove other hidden ping commands from client code
Upstream-commit: 0eeb146398470bb586ce5b3f1dff28f2f4bbaa4e
Component: engine
2014-03-03 17:34:21 -08:00
e06ddb9508
Merge pull request #4382 from unclejack/fix_symlink_handling
...
handle symlinks for Docker's root dir & TMPDIR
Upstream-commit: d761ebea6f4122bd0592267f2a5fe907a86cd338
Component: engine
2014-03-04 03:23:11 +02:00
abf9a1fe77
make the port mapping deprecation error message more obvious see 4075
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2275c83358986c9f612ebb1915c5d3392319f1f8
Component: engine
2014-03-04 10:45:26 +10:00
4a0a6ccc48
Merge pull request #4437 from SvenDowideit/tweak-DCO-hook-for-windows
...
Replace `echo -e` with the portable `{ echo; echo ...; }`
Upstream-commit: 52d212aa6eb004de410a14df5f6c49f9c3a93f61
Component: engine
2014-03-03 17:43:37 -07:00
207b929d4d
nope, echo -e isn't portable
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4f29836f7158521f31e42ea6dfde6c19cd069715
Component: engine
2014-03-04 10:40:36 +10:00
dc4d93c655
Merge pull request #4327 from crosbymichael/add-libcontainer
...
Add native execution driver to docker and make it the default
Upstream-commit: 69c69059fc3933531e19c05a9d2e831fb713881c
Component: engine
2014-03-03 16:34:20 -08:00
359b89f779
Merge pull request #12 from SvenDowideit/add-libcontainer-minor-doc-tweak
...
very minor spelling
Upstream-commit: 77766834a3326e52a35b8b0667329b81098b4b06
Component: engine
2014-03-03 19:19:16 -05:00
ad94508fb5
Merge pull request #4419 from SvenDowideit/tweak-DCO-hook-for-windows
...
Fix newlines echoing in DCO git hook contrib script
Upstream-commit: 93c1a7b79615b8e94fe9d826aee24e01a7087f94
Component: engine
2014-03-03 17:14:08 -07:00
71633326e7
very minor spelling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2e71adac9f2935abaf17741a440497e7e31388e2
Component: engine
2014-03-04 10:12:12 +10:00
ba4d7c0ac6
it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 43feb84203d5c0ca3b2cb110a96b3dd0ec3a93df
Component: engine
2014-03-04 10:08:40 +10:00
24c198410e
Merge pull request #4435 from vieux/warning_makefile
...
Remove warnings from Makefile
Upstream-commit: b1267cb6ada5494b5fc720c08fc27844cd5c6d0e
Component: engine
2014-03-03 16:40:31 -07:00
d1e812bd95
remove warnings from makefile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b9cb95c0a07e421c8cbf83fa79aaedead809c802
Component: engine
2014-03-03 23:32:25 +00:00
111101411b
Merge pull request #4413 from jamtur01/exemption
...
Added documentation (and some cleanup) around small patch exemptions
Upstream-commit: fca4cf6f0aa50f8bac307fa72faca9f137cbb4b5
Component: engine
2014-03-04 09:10:37 +10:00
252c901eb2
Merge pull request #4432 from vieux/fix_warning_as_error
...
fix warning can't docker run
Upstream-commit: 5639b29b78a99d2ddd545f7452b4c155e44143fc
Component: engine
2014-03-03 17:16:25 -05:00
4d3778ca3d
fix warning can't docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e23b4e5d15da3e04692ac44370b1945a875206f0
Component: engine
2014-03-03 22:07:42 +00:00
04d68b69ad
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
8b72c046df
Merge pull request #4412 from crosbymichael/fix-env-clobber
...
Don't always just append env vars, replace defaults with ones from confi...
Upstream-commit: aac9542a68ee59c62c2cf15df69f77640113bb95
Component: engine
2014-03-03 22:52:03 +02:00
085a080854
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
2014-03-03 12:36:47 -08:00
e09257e20a
Factor out finalize namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5465fdf00f3ece165cbd3bb680dcc571e81510dd
Component: engine
2014-03-03 12:15:47 -08:00
3e1518adfc
Merge pull request #4428 from vieux/add_warning_flags
...
add warning for deprecatd flags
Upstream-commit: e070db75fed525efdbfe0a056c9e38f3d46604cb
Component: engine
2014-03-03 12:09:09 -08:00
b49fc1301e
add warning for deprecatd flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: bb5ed452241c37ee9f2f3ebd02a2a5e1764334ad
Component: engine
2014-03-03 19:57:05 +00:00
11719ff90c
Update readme to remove .nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2f35f8e2a88a378d7ff8eacf5346f9711a59489a
Component: engine
2014-03-03 11:31:37 -08:00
60e9c4cdca
Merge pull request #4426 from vieux/prevent_grouping_--
...
prevent flag grouping with --
Upstream-commit: 93f925c5336489e7c47f9471cfa89a8c6b7a850e
Component: engine
2014-03-03 21:30:49 +02:00
5f84dbf6b9
prevent flag grouping with --
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: cb3d27d01bbf696929b4d77d10e47eca2693e3fa
Component: engine
2014-03-03 19:17:28 +00:00
24df4590b2
Merge pull request #4377 from vieux/fix_4358
...
fix fedora tty with apparmor
Upstream-commit: 23ec7e637c13315ad7efdf5194c3f41e5d5bfa4d
Component: engine
2014-03-03 11:10:09 -08:00
5d5ad8f867
Merge pull request #4321 from vieux/docker_run_-it
...
Add support for docker run -it or docker images -qa
Upstream-commit: 7531f82c70e44ac93d540c380ecfd2a52980f86f
Component: engine
2014-03-03 20:52:10 +02:00
2aae4c5f25
Merge pull request #2 from SvenDowideit/docker_run_-it_docs
...
add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 954a913c1f32c604037c81279afaf15080873447
Component: engine
2014-03-03 18:48:47 +00:00
8138b2b95b
Merge pull request #4398 from philips/fix-socket-activation
...
fix(api): serve until the "acceptconnections" job
Upstream-commit: 690fb50beb9052190982981ec340e3e1e9038391
Component: engine
2014-03-03 10:19:51 -08:00
932c2a4033
Merge pull request #4200 from alexlarsson/fix-fedora-tests
...
Fix fedora tests
Upstream-commit: 62d604a81ecb7d99eda48f86d6671073fd14d34d
Component: engine
2014-03-03 10:54:31 -05:00
69778919d2
Merge pull request #4420 from unclejack/bump_to_go_1.2.1
...
Bump Go to 1.2.1 in the Dockerfile
Upstream-commit: ded2fb883dd3c20069f01e37178ce585d1c0c6b0
Component: engine
2014-03-03 07:56:31 -07:00
d1123e2435
aufs: Skip tests if aufs not supported
...
This makes it possible to pass the rest of the testsuite without aufs in the kernel.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 9e28c3e3f86664ef8f219f11ef19c74a414346a9
Component: engine
2014-03-03 15:11:49 +01:00
