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
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
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
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
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
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
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
cfffdb552d
Added bitbucket hook info and warning re: validating accounts.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: e80d075633d3c642d6640bf2178fedb8891cb97e
Component: engine
2014-07-10 16:51:16 -07:00
c15db86f61
Add --device flag to allow additional host devices in container
...
We add a --device flag which can be used like:
docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash
To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.
Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: e855c4b92170534864b920ec1e267b3a815764f9
Component: engine
2014-07-10 10:35:53 -07:00
abe9a19e05
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
Upstream-commit: d9265007a0f7c6e47c015b427d59b5638e1102c1
Component: engine
2014-07-10 10:29:15 +00:00
884f8c36f5
Merge pull request #6945 from fredlf/copyedit-builds
...
New screenshots and revisions to builds.md
Upstream-commit: 98e099e3a01104d2ecf3178363d3b76c8c3619dd
Component: engine
2014-07-10 09:06:58 +00:00
323df0e24b
Fix typos
...
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com > (github: squarejaw)
Upstream-commit: 1df4049e17e4a3edf4487b072f2085bc2dd2ee0b
Component: engine
2014-07-09 23:14:06 -05:00
952492cc20
bump api to 1.14 & update docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
2014-07-10 03:24:01 +02:00
61277bebb4
Merge pull request #6942 from jamtur01/addcopy
...
Replaced selected docs references to ADD with COPY
Upstream-commit: 9319b7aef119c83f97dfd028cd557d4cb143d04b
Component: engine
2014-07-09 17:48:31 -07:00
8e5e1a569d
New screenshots and revisions to builds.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: ce9d48e896060d05a78563dce30abfcd5a99c478
Component: engine
2014-07-09 16:43:39 -07:00
efd625f4f3
Replaced selected docs references to ADD with COPY
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a1ddf57216e510c5cabe40cac6a00ac57a92b8d7
Component: engine
2014-07-09 17:13:26 -04:00
34b700c7bf
Updated docker logs timestamp to RFC3339
...
Currently the docker logs timestamp flag generates log entries like:
$ sudo docker logs -ft daemon_dave
[May 10 13:06:17.934] hello world
It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].
This is non-standard operational timestamp and one that will require
custom parsing.
The new timestamp is RFC3999Nano and generates entries like:
2014-05-10T17:42:14.999999999Z07:00 hello world
These are readily parsed by tools like ELK.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
2014-07-09 11:59:06 -04:00
6971f5c244
Tiny text reformat (as per review comments)
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: e479cae7cf86a2929e0439a61565ed7d9100f445
Component: engine
2014-07-09 08:21:31 +01:00
e3ec85f712
Merge pull request #6835 from OddBloke/master
...
Explain ADD invalidation more accurately
Upstream-commit: 037a869919a686cd18c7a5873842f523ff4b492e
Component: engine
2014-07-08 20:41:59 -04:00
f3b4015ccd
Initial copy edits to builds.md
...
Revised to match new UI, fixed links, copy edits and improvements.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
More revisions to builds.md
Corrections to automated build process, copy edits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Edits based on Sonat's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 27c34f3eb93ee58d585f8b792659dc2c0464bd0d
Component: engine
2014-07-08 17:01:41 -07:00
3fadeb2381
Merge pull request #6865 from SvenDowideit/remove-the-named-container-before-creating-a-new-one
...
Don't make the user get a container already exists error
Upstream-commit: 446ceee51ed1cde3a291c7d53ab3bd0c4a1573ea
Component: engine
2014-07-08 14:42:17 -04:00
1cc255b83d
Typo fix
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: a247b63aa18a31cc2aeb8e32c06b040a47764d0b
Component: engine
2014-07-08 10:01:26 +01:00
7cc3436ee3
understanding-docker: Use consistent term
...
Term 'service' was used together with 'daemon'. It would be better to use the term 'daemon' solely because most part of documentation are using the term.
Upstream-commit: 14ffde2d8c67065a24930e0ac0844099cbc2cfa8
Component: engine
2014-07-08 14:50:57 +09:00
843b374f7e
Don't make the user get a container alreayd exists error
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 6a9c6d3bf12982ca31e0b38cd323073b44c98456
Component: engine
2014-07-08 11:09:55 +10:00
4bbfd572e7
Merge pull request #6871 from prosto-chewey/patch-1
...
Update running_riak_service.md
Upstream-commit: 0284e5dfeaecd7e4103cfaa5c77cff1f4ffa1290
Component: engine
2014-07-08 09:35:01 +10:00
16bd2397f1
Merge pull request #6870 from andreaturli/doc/jclouds-client
...
add jclouds-docker client reference
Upstream-commit: d20367c2164e21035b105a9fe2edd30afc2d6b71
Component: engine
2014-07-08 09:29:27 +10:00
bdbe2e1a2a
Merge pull request #6452 from mheon/selinux_btrfs_fix
...
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
Upstream-commit: 219a3345deade869a415436c2b5c24c0c523ca08
Component: engine
2014-07-07 11:34:50 -07:00
e6a7274d4c
Standardize "curl" arguments across the repo to be or include "-sSL"
...
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 9f61e233c6da72f692190f1f5eb672341253f3e7
Component: engine
2014-07-07 10:35:38 -06:00
1991704086
Update running_riak_service.md
...
Upstream-commit: 963ee6ce795ae6608ee9acce4bc6298356d7f02f
Component: engine
2014-07-07 17:52:18 +04:00
e2109c74a8
add jclouds-docker client reference
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: )
Upstream-commit: 2f13d3a8e541b918135ea0bf0153f56927dd0511
Component: engine
2014-07-07 15:14:41 +02:00
10fd0b6403
Reformat to keep line length within 80 characters
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: ebbfdf0a0f99aac67b8ad5d789d8a400be346c30
Component: engine
2014-07-07 12:01:04 +01:00
58385e59a1
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
Upstream-commit: 323e6a3cf29677459a7bc658a0b5221e5675bc46
Component: engine
2014-07-07 11:16:55 +10:00
