415acc0f7a
Merge pull request #7 from tianon/fix-hack-tags
...
Update build tags such that we can properly compile on all platforms
Upstream-commit: 2128eb52eda1a65e725a9a98f500a468778092f0
Component: engine
2014-03-06 12:49:05 -08:00
24c5efffe2
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
2014-03-06 13:39:17 -07:00
2ebfedab6d
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
2014-03-06 12:05:03 -08:00
9f58f80f28
Use CGO for apparmor profile switch
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: f0f833c6d795fc8b3fb4bb379f9916745f5c7ac9
Component: engine
2014-03-06 11:10:58 -08:00
4b6cf8782b
Merge pull request #4498 from alexlarsson/fix-cloexec-race
...
libcontainer: Don't use UsetCloseOnExec, it is racy
Upstream-commit: 6af82bf4ca319c4881ede9a6cdf41e7dd7c901ef
Component: engine
2014-03-06 11:45:26 -05:00
7a63cc6849
Merge pull request #4474 from timthelion/master
...
Change mustn't to must not
Upstream-commit: c273a93cf9106f1c0a8cf9766ecaf71e4294400f
Component: engine
2014-03-06 09:48:59 -05:00
098ea0f413
libcontainer: Don't use UsetCloseOnExec, it is racy
...
We can't keep file descriptors without close-on-exec except with
syscall.ForkLock held, as otherwise they could leak by accident into
other children from forks in other threads.
Instead we just use Cmd.ExtraFiles which handles all this for us.
This fixes https://github.com/dotcloud/docker/issues/4493
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5c9b28db1853cccdf7a1037eeaad372d12cd68fa
Component: engine
2014-03-06 14:10:32 +01:00
2eb4a2724e
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
Upstream-commit: fb314c266b188de8aa0499c5314b01fd5d088475
Component: engine
2014-03-05 16:08:37 -08:00
eb76d6728d
Merge pull request #4264 from ndarilek/2973-skip-volumes-from
...
Don't call applyVolumesFrom on containers with volumes already configure...
Upstream-commit: 1ad14effb507589b84e5f93e7682c8e45ec10c28
Component: engine
2014-03-05 15:44:15 -08:00
6e470bbbd0
Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
...
Flag 'docker-js' as outdated (Fix #4467 )
Upstream-commit: 8d947da826498fb4b563edb1e68396c821238a39
Component: engine
2014-03-06 09:37:34 +10:00
2e15652abb
Merge pull request #4477 from creack/apparmor_native
...
Add AppArmor support to native driver + change pipe/dup logic
Upstream-commit: 3ab4a28807c03028328f9172fc41a512cc1ca7a4
Component: engine
2014-03-05 15:23:31 -08:00
41674425c0
Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep
...
Update PACKAGERS.md and hack/make/ubuntu
Upstream-commit: d03be9d7cf95bffff024a4be54f6c928f76adea9
Component: engine
2014-03-05 16:15:16 -07:00
50624219ad
Generate and load custom docker profile for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 920a6ca54ce98673d0c9a6a9502a469c1c225c75
Component: engine
2014-03-05 15:02:11 -08:00
f8aabff977
Merge pull request #6 from crosbymichael/tryagain2
...
Some cleanup around logs
Upstream-commit: 4b700dbe85aa22a6272d5adb533b642ba8c905e0
Component: engine
2014-03-05 13:54:21 -08:00
53277b63e3
Some cleanup around logs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 37f137c8221be07943babeb9b107e5aee9a736d5
Component: engine
2014-03-05 13:50:49 -08:00
c1e434e543
Add AppArmor support to native driver + change pipe/dup logic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: cb4189a292dc181e26e0506a3a0dc67936c5401b
Component: engine
2014-03-05 13:08:24 -08:00
467d1e34b3
Merge pull request #4478 from vieux/add_missing_--_native
...
Add missing -- when we run dockerinit from native
Upstream-commit: a24a802193dc9599c2d074a3629539412d8716ca
Component: engine
2014-03-05 15:35:25 -05:00
e13d9e18a0
Merge pull request #4444 from SvenDowideit/update-host-integration-docs
...
update to use --name, and add a little more detail to how docker start -a works
Upstream-commit: 34fe14f1746903e5775a2e34ebb1176a885dc380
Component: engine
2014-03-05 12:30:55 -08:00
60c64fda87
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
Upstream-commit: ac734f0d36542cef241226218fde2ab2b8c191e9
Component: engine
2014-03-05 12:29:46 -08:00
f1ce37be65
Merge pull request #4449 from jamtur01/readme
...
Some fixes and 0.9.0 pre-req changes to the README.md
Upstream-commit: bb0211ff30aaaae21d6361eb24bc2f216883e1bf
Component: engine
2014-03-05 12:28:32 -08:00
dae86c26a4
Some updates to the README.md
...
* Updated pre-reqs for 0.9.
* Fixed a couple of docker to Docker.
* Fixed the Docker build example to be correct.
* Reformatted a bunch of paragraphs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 046e6604e56ec93647550630fcf729c7e5ab3280
Component: engine
2014-03-05 15:27:49 -05:00
7cf0d3e449
Add missing -- when we run dockerinit from native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c987901f8d64ab2390409018074b2f93c1718e89
Component: engine
2014-03-05 20:26:48 +00:00
2c72e525f4
Merge pull request #4476 from vieux/improve_flags
...
Improve flags
Upstream-commit: c05e095baaa2de865e2e8712cbb7a37654bd41aa
Component: engine
2014-03-05 21:59:05 +02:00
ceba53329c
fix panic with only long flags or only one deprecatd
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 069dc7f8c7bc3eaf61ddd926636aacce5f1ed1ee
Component: engine
2014-03-05 19:45:57 +00:00
fdbd555f75
fix usage for completly deprecated flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 089bf5e11e4284a6ed07dc165098bb269dfddf46
Component: engine
2014-03-05 19:27:39 +00:00
6397413ba7
Merge pull request #4471 from unclejack/fix_integration_test_deprecation_warnings
...
fix flag deprecation warnings in integration tests
Upstream-commit: 7ec82aa7273cb645f484e226e74b1fe4b86580de
Component: engine
2014-03-05 11:00:56 -08:00
161ea04aaf
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
Upstream-commit: 910168616183e815845afc7a64b05eec7737b580
Component: engine
2014-03-05 10:22:51 -08:00
0c5b60533c
Merge pull request #4461 from jamtur01/capital
...
Consistently capitalize CLI options
Upstream-commit: 2a8c927f33fcd52f75281562a053476fcadb09ba
Component: engine
2014-03-05 10:21:20 -08:00
a9b2a5c70f
Change mustn't to must not
...
mustn't is ambiguous. It may mean "you don't need to" even when it's not a tag question. See prose:
http://books.google.cz/books?id=otFPvwLG524C&pg=PA241&lpg=PA241&dq=mustn%27t+trouble+yourself&source=bl&ots=vjgh7n-yyW&sig=LBQAwlZu3GxI5YzvRAXFow4hE1U&hl=en&sa=X&ei=a14XU9vxB4SBywOPz4HwDw&ved=0CDQQ6AEwAg#v=onepage&q=mustn%27t%20trouble%20yourself&f=false
http://www.nytimes.com/books/first/m/maynard-home.html (search for mustn't)
We mustn't argue over grammar.
See: https://github.com/dotcloud/docker/pull/4473
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: 47f1609f5c491557237fd998840311cb53d95573
Component: engine
2014-03-05 17:33:18 +00:00
b24c7af61f
Merge pull request #4278 from alexlarsson/system
...
Create pkg/system and move stuff there from archive
Upstream-commit: 858d0356fda68da36946dc5d7e1b2ad64153b6ae
Component: engine
2014-03-05 12:32:35 -05:00
d6863f6db2
Merge pull request #4465 from alexlarsson/private
...
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
Upstream-commit: ad68ab19e0fef046097891c8c5704d82ed585df1
Component: engine
2014-03-05 12:16:18 -05:00
18fac79f25
Add further clarification of where/when the build-time deps are applicable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c41e51ce3df05553b7a4ce6960df68973a4e17ee
Component: engine
2014-03-05 08:20:42 -07:00
587cb127e7
fix flag deprecation warnings in integration tests
...
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 35054601d868a82841c220ff474ad47c5d52e871
Component: engine
2014-03-05 16:43:03 +02:00
42b0cd2529
Create pkg/system and move stuff there from archive
...
This is a package for generic system calls etc that for some reason
is not yet supported by "syscall", or where it is different enough
for the different ports to need portability wrappers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: d6114c0da0e844199e3d23c60a04434566fb5392
Component: engine
2014-03-05 14:05:32 +01:00
cb1dbed1c9
Flag 'docker-js' as outdated
...
Upstream-commit: 5e32c40795e527cc2e916fe5b8970b37e9485266
Component: engine
2014-03-05 20:16:41 +08:00
90b2106a7f
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
...
Now that we unmount all the mounts from the global namespace we can
use a private namespace rather than a slave one (as we have no need
for unmounts of inherited global mounts to propagate into the
container).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 757b5775725fb90262cee1fa6068fa9dcbbff59f
Component: engine
2014-03-05 09:40:54 +01:00
10b41687cf
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 5317ad476d9e2c39cf6379fef4ec7f8ba0bcc23a
Component: engine
2014-03-04 22:59:46 -07:00
5cfec2c466
Update the relevant docs section to match PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4293a1ceb476ce4a8621ac1500a3623328fb5b97
Component: engine
2014-03-04 22:54:58 -07:00
200f519512
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b69f63283088e1ac744aafeb08189cb593b30787
Component: engine
2014-03-04 22:52:39 -07:00
172cbdf737
Rewrite more loads of PACKAGERS.md to hopefully remove some outdated information, add some updated information and pointers, and generally make the tone of this document less condescending :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 615667b8831e49474ad7d255d62343c2427514ec
Component: engine
2014-03-04 22:51:34 -07:00
812f45a7e0
Mention in PACKAGERS.md that Tianon is available for packager needs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d9ec3a034719ac933a791bdf064afe8afb63b1f9
Component: engine
2014-03-04 21:41:59 -07:00
b7c44f214d
Reflow PACKAGERS.md to 80 columns (where possible) and update some minor formatting
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 9a677e6a68c9a07df8591d87ba82d77934600426
Component: engine
2014-03-04 21:40:42 -07:00
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
59e55af69a
Closes #4374
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: )
Upstream-commit: 83de8bb842b97094651207202a5474b8fec5259f
Component: engine
2014-03-05 02:41:14 +00:00
dc81426ab3
Updated a variety of language and error messages
...
In api/client.go updated:
1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 9cbf22dee26e363bbe3738bbbcd1d70773d80d0d
Component: engine
2014-03-04 20:52:48 -05:00
53d25513fd
Made CLI option capitalization consistent in api/client.go
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 725c7cd08af5b895becce19e59fe98cebdc67cf2
Component: engine
2014-03-04 20:45:22 -05:00
821bf64ace
Consistently capitalize CLI options
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 41bf38e44d8ef53468e76870182fa05c515a1cf5
Component: engine
2014-03-04 20:22:51 -05:00
eed6462b7a
update to use --name, and add a little more detail to how docker start -a works
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3acbd758d84294e3434609ae3ecf52cd5ed9ee4b
Component: engine
2014-03-05 00:57:08 +00:00
