4e42254381
Closes 6937. Allows setting of docker config dir.
...
Can now dynamically set the docker config directory through an
environment variable.
export DOCKER_CONFIG=/path/to/docker_config/
Default behavior remains the same, e.g. ~/.docker
Documentation for change added to the https.md docs.
Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org > (github: jameskyle)
Upstream-commit: c0471ee35aa58a99b423ad914301194e8f3663c1
Component: engine
2014-07-15 15:47:00 -07: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
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
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
067d7ed315
Merge pull request #6896 from vieux/add_parsing_deamon_side
...
Add repo/tag parsing on the daemon for pull and import
Upstream-commit: d53db040c867403e76915459eafbb5d7fd1d2887
Component: engine
2014-07-12 01:44:32 +03:00
c1e9ed3e53
Merge pull request #6985 from vieux/fix_api_1.14
...
bump api to 1.14 & update docs
Upstream-commit: 00c1668011d26245e73f9faeb5d461a925948b71
Component: engine
2014-07-11 15:35:25 -07:00
1e36ca4638
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: cdfdbe9bc61b157b0390bce26c4d6e41673ad495
Component: engine
2014-07-11 22:39:43 +00:00
8850edab1a
Merge pull request #6979 from LK4D4/fix_race_inspect_start
...
Use container.Lock in public ToDisk method
Upstream-commit: c3f247860aa169f4a9530d025da935d71af72f20
Component: engine
2014-07-11 13:44:01 -07:00
241e1f987c
Use container.Lock in public ToDisk method
...
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: eae5cf1e20e8d93cc13ea8e1db3cd787250fa76d
Component: engine
2014-07-11 23:31:03 +04:00
62e2ad87d9
Edits based on feedback from docs team.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 358758e99fcfd40508b77b06bb8b53ecdde71a4c
Component: engine
2014-07-11 11:42:29 -07:00
eaad0a8c81
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: c3d91263a867aa4ac4da6c2cad52f0505a6eccf0
Component: engine
2014-07-11 14:35:01 -04:00
eb6f1ba58f
Add Tibor Vass as maintainer
...
* hack/
* archive/
* integration/
* server/buildfile.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 1a99f36580fc814778170ae68f5ea53694aa5c12
Component: engine
2014-07-11 12:28:11 +00:00
73381dfd80
Merge pull request #6209 from zdover23/03_Jun_2014
...
BZ#1104401 - correcting flags in docker-commit
Upstream-commit: 7c4f7780a17db76f29e46a7cdc73538f23c6adda
Component: engine
2014-07-11 08:03:36 -04:00
f98a366776
add FSETID back to the caps whitelist
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e8762bfe39531309327138d93c0b586f8b9cea99
Component: engine
2014-07-11 00:30:56 +00:00
James Kyle
Fred Lifton
Sven Dowideit
Henning Sprang
Michaël Pailloncy
Harald Albers
Tianon Gravi
Solomon Hykes
Michael Crosby
Tibor Vass
Johan Euphrosine
LK4D4
Gabor Nagy
James Turnbull
Adrien Folie
Victor Vieux
unclejack
Victor Vieux
Aaron Huslage