bf242e249b
Fix cap drop issues with lxc
...
This uses "," instead of spaces so that the flags are parsed correctly
and also does not do a strings.Split on an empty string because
strings.Split will return a slice with one element, and empty string
causing parsing to fail when it validates that the cap exists.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 47917135daa38b40a1a3ee11f31153b031ea7963
Component: engine
2014-07-16 12:14:26 -07:00
41c1e3bafe
Merge pull request #6991 from bobrik/empty-dockerignore
...
Skipping empty lines in .dockerignore
Upstream-commit: 1583e7af416d5c1ff4b99c59f92a953d1ed0ac25
Component: engine
2014-07-16 10:46:38 -07:00
bcb367a385
Merge pull request #6601 from SvenDowideit/6510-docker-pause-docs
...
6510 docker pause docs
Upstream-commit: 3b3f0fa085c9a5208587c1ac2e69c2e9f8d727ed
Component: engine
2014-07-16 03:30:49 +00:00
781eab6c3f
the package now adds the bash_completion too
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fa5bce2859e0b0fc3eeade3a97777d371fceca3a
Component: engine
2014-07-16 11:46:18 +10:00
69f799334b
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: c6197058a87e18ba7c7568fbc7d3fb29db79766d
Component: engine
2014-07-15 17:41:59 -07:00
5dba8f7a96
re-jig the info into all the places
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 58955a30ffffb8e9dafb8593f4513d6dae53abfd
Component: engine
2014-07-16 09:42:46 +10:00
5d75903f2b
Add cgroups freezer info
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: SvenDowideit)
Upstream-commit: 3957d72f9cd613fa8a0eeb03517e4f78f9cc58f1
Component: engine
2014-07-16 09:42:46 +10:00
cadd66b6cf
Add cli.md documentation for docker-pause and docker-unpause
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5b8a6eb05f8c69670814e400f7f85ae221c8bae4
Component: engine
2014-07-16 09:42:46 +10:00
6397b0f7fb
Merge pull request #7039 from jamtur01/apidoc
...
Removed legacy api.md file
Upstream-commit: d736754a47311025994e748b0fe1ec6c92d59973
Component: engine
2014-07-15 23:12:22 +00:00
dbb0dbb0d2
Merge pull request #6892 from mpapo/docs-docker-aufs-limitation
...
Add small note about AUFS layer limitation
Upstream-commit: 9c8b59c1b02dd2d2138fd48aaa27a62b0d09b371
Component: engine
2014-07-15 15:03:46 -07:00
46c8ba0722
Merge pull request #7037 from henning/patch-3
...
Adjust Link description to match target
Upstream-commit: 5bdf2cf45905f24c5b1e5732bde53b70f833d24b
Component: engine
2014-07-15 21:55:06 +00:00
f54b06dceb
Merge pull request #6855 from SvenDowideit/update-osx-installer-image-to-show-final-page
...
The installer completed page now contains information on next steps, so ...
Upstream-commit: b6e1cfc07537cfb6ea403d3b9163b693276a6c5d
Component: engine
2014-07-15 21:17:29 +00:00
8d23a98c51
Removed legacy api.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 4fc8edd0df742a559fe6a4961223a644ab088fa7
Component: engine
2014-07-15 16:40:43 -04:00
19c5a08bfa
Adjust Link description to match target
...
The target document headline is "Managing data in containers" and so should the link be named.
Upstream-commit: fb51a330bb1bfb442f2e220a39a991ea0c69c69b
Component: engine
2014-07-15 22:24:08 +02:00
6c75ad07a9
Update small note about layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: 2a230729dae91a54cfe617843b1dd7141ad51948
Component: engine
2014-07-15 21:58:01 +02:00
9e62037a6b
Add small note about AUFS layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: d91d381856b7c91fa992c3cd1943f27c269219f2
Component: engine
2014-07-15 21:58:01 +02:00
ceb0c3835c
no need to create a link to the docker binary
...
Upstream-commit: 88c601764415416e291d492b137f09e9fa175106
Component: engine
2014-07-15 14:18:28 +02:00
2ff183b13e
Merge pull request #6755 from tianon/bash-completion-for-link-and-bind
...
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
Upstream-commit: 47de2e32698e7adbc3b1292186ce9dcddc15cf41
Component: engine
2014-07-15 00:15:13 -06:00
72805d66a0
The installer completed page now contains information on next steps, so is more useful than the intro
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: f9760144109435e12de526251275a9a3e1b7c8fd
Component: engine
2014-07-15 13:50:12 +10:00
b8d866ae4d
Merge pull request #6885 from tianon/standard-curl-sSL
...
Upstream-commit: 781a47e3f37f952630d2bdf4936388aaf52f3707
Component: engine
2014-07-14 18:39:31 -07:00
98075d5376
Merge pull request #6994 from Aigeruth/fix/docs/registry_api
...
Fix MarkDown in Docker Registry API docs
Upstream-commit: 9d6f295d5d019cf95bec3e607e1bd6cb0b42e310
Component: engine
2014-07-14 15:15:29 -07:00
26acedf3be
Merge pull request #7019 from crosbymichael/update-libcontainer-july2
...
Update libcontainer to version fb67bb80b4205bece36ff7096ee7
Upstream-commit: 12d58a26882d6a30c4530a76ef38923e0751bf82
Component: engine
2014-07-14 14:51:00 -07:00
ad74ef7753
Update native driver for libcontainer changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: f00e64357672ea3a130b2570ce34ea48ad51bbb5
Component: engine
2014-07-14 12:49:50 -07:00
182632c50d
Update libcontainer dep to fb67bb80b4205bece36ff70
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 3b4a1c54d834a21a2b2a22b359495939db3b77f1
Component: engine
2014-07-14 12:30:19 -07:00
2226522e72
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4f0fbb885eb6b561fd6e4ba26b35cb30dd8d9121
Component: engine
2014-07-14 12:34:04 -06:00
b2c113f9b8
Merge pull request #6968 from vieux/cap_add_drop
...
Add support for --cap-add and --cap-drop
Upstream-commit: 7ebd49c49a9f70c87b6dbcff250035d3fd349a20
Component: engine
2014-07-14 10:42:29 -07:00
de7636ac74
Merge pull request #6970 from vieux/add_FSETID
...
add FSETID back to the caps whitelist
Upstream-commit: b39fb160c6a2dffc94dd80599c39159393f4e5e9
Component: engine
2014-07-14 10:37:04 -07:00
88c1dfaedb
Merge pull request #7016 from LK4D4/fix_some_cleanups_in_archive
...
Some resource clean ups in archive
Upstream-commit: dfbb291c4005bbf6fec8b5cd9c95ebec58cdf3b1
Component: engine
2014-07-14 13:26:47 -04:00
bd79f253bc
api/server/MAINTAINERS: comment proppy (vacation)
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 32740543daf889388662a963d8a61b1096e75693
Component: engine
2014-07-14 10:13:46 -07:00
d90f5b872a
Some resource clean ups in archive
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 66ccd55ed4676b0b306829aa01ffdd4067c9960e
Component: engine
2014-07-14 21:11:48 +04:00
b7ac44b71e
Merge pull request #6967 from fredlf/copyedit-builds
...
Added bitbucket hook info and warning re: validating accounts.
Upstream-commit: b93787e6e002dc02d7fef2610b5ed905399f3899
Component: engine
2014-07-14 03:35:37 +00:00
431996d45d
Fix MarkDown in Docker Registry API docs
...
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu > (github: Aigeruth)
Upstream-commit: b1677f9d09d3a66ddf5c22346f0ea2a22cb2560d
Component: engine
2014-07-13 11:15:52 +02:00
74b5628fb6
General cleanup of the builder.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 07d93c6e34fb3524add4424f7753253d2501a598
Component: engine
2014-07-12 11:30:51 -04:00
c5579fccfd
Merge pull request #6990 from folieadrien/missing-rm-api-docs
...
add missing api docs for #6863
Upstream-commit: b5a69da5b67d6b8a9867de974d31cf89329689cf
Component: engine
2014-07-12 11:21:54 -04:00
f47a491cb1
Skipping empty lines in .dockerignore
...
Docker-DCO-1.1-Signed-off-by: Ian Babrou <ibobrik@gmail.com > (github: bobrik)
Upstream-commit: 1a1ee73e38eb54f9b5a3fd03f98c4bb80dde1bbb
Component: engine
2014-07-12 13:38:33 +04:00
66134747fb
add missing docs for rm
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 88326e9b91435d2183f943a2905fa516d0b5d78e
Component: engine
2014-07-12 06:33:43 +02:00
e35798d6ab
Rewrote the ENTRYPOINT section in builder
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: b2ba1a9ce5709ee6f143b79bd543f95a4aa03c14
Component: engine
2014-07-11 22:12:59 -04:00
76bdfebd46
update api doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 6bb27f18d19201d8c0b3c509151935308c001c22
Component: engine
2014-07-12 01:03:12 +00:00
c802db49a3
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e7d9854414ed77765db49af136533871ba443f3c
Component: engine
2014-07-11 23:43:21 +00:00
e7f2c9317d
add check for invalid caps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: c04230c42b7a953ffe50bc37d351f86e80a442e6
Component: engine
2014-07-11 23:43:21 +00:00
5201bb5120
support add and drop in both order
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 064b5f870db39e33f18d6dd405f2bdab98255ef7
Component: engine
2014-07-11 23:43:21 +00:00
669e2fe479
add basic support for 'all'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 222a6f44016451dcbd2da0003e64521c06e88ba9
Component: engine
2014-07-11 23:43:21 +00:00
2032a7ad93
small refactoring
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f3ff323fb364495617de3e43f2d09a145a4f2ee3
Component: engine
2014-07-11 23:43:21 +00:00
986cb2347f
fix job and add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8344b6d7368b90c567f43e0c17d4495e2e7b12f5
Component: engine
2014-07-11 23:43:21 +00:00
d4b6724355
Basic --cap-add and --cap-drop support for lxc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 21059af3ac0136607dbb57c796f625cfbd045177
Component: engine
2014-07-11 23:43:21 +00:00
ca489c2f49
Basic --cap-add and --cap-drop support for native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 94e6dc978134b61a2b30aa9118f98f6fadd10535
Component: engine
2014-07-11 23:43:21 +00:00
db8c3bf836
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: fe5ab5b058e33d2d8577f1803448078e8eb92345
Component: engine
2014-07-11 23:27:23 +00:00
91c66dc425
update CLI & api docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 5ba11e6890e51fd01f674160473af3ac432622c5
Component: engine
2014-07-11 23:26:08 +00:00
3853ef9c11
Add tests for rm with stop and kill options
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: d689a5e1e2633b5fd0db4ccccfb4969e03ae256b
Component: engine
2014-07-11 23:26:08 +00:00
ceab494147
Stop/Kill options for containers removal
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 78100706303efdf9a3deee0239a7dbb3a93837ec
Component: engine
2014-07-11 23:26:08 +00:00
