Commit Graph

1135 Commits

Author SHA1 Message Date
6c85a7de88 Merge pull request #3303 from crosbymichael/add-host-flag
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
2013-12-30 15:54:37 -08:00
46e4624179 Merge pull request #3395 from jamtur01/basicsfixes
Minor fixes to the basic command documentation
Upstream-commit: 643621133fafc7ea0b479cd636afd1e397055930
Component: engine
2013-12-30 15:41:59 -08:00
f0c55c27ee simplify the volumes documentation and mention more details
Upstream-commit: fd240413ff835ee72741d839dccbee24e5cc410c
Component: engine
2013-12-31 09:09:57 +10:00
1a0b6cfa05 Minor fixes to the basic command documentation
Upstream-commit: 0dfebf2d93e4990f12ba5d434e1750046008782f
Component: engine
2013-12-30 13:57:11 -05:00
b284ad7fc3 Merge pull request #3394 from jamtur01/clifixes
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
2013-12-30 10:56:47 -08:00
70af7e708f Numerous small fixes to the CLI documentation
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
2013-12-30 13:48:12 -05:00
038cb6fc8c Merge pull request #3371 from Grunny/volumes-typo-fix
Fix typo in working with volumes doc page
Upstream-commit: e31f1f1eba498c3ff4073a43533e68bf993cbbcb
Component: engine
2013-12-30 10:35:09 -08:00
09f511f43d Merge pull request #3312 from DeX77/master
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
ea65bc7c4b Merge pull request #3380 from SvenDowideit/add-no-auth-note
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: 237868e9c3f9d1cb5f5311ef2710f83e1b3b898a
Component: engine
2013-12-30 10:00:51 -08:00
c647c27460 fixed header size on narrow desktop window
Upstream-commit: 434cf6c8ca5d20306dc27e770155ba05a931adec
Component: engine
2013-12-29 19:22:52 -08:00
cc877515e3 Make blank -H option default to the same as no -H was sent
Upstream-commit: 8b82b0dfe74684b5ea30b7487475f7ca4abcc58e
Component: engine
2013-12-29 14:36:46 -05:00
5e0630fcf8 add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: e93b7b464733470a08a46b9937678fbfdff0abb0
Component: engine
2013-12-29 21:27:59 +10:00
87ba43c927 Add DOCKER_HOST env var for client
This env var will set the -H flag on the docker
client.
Upstream-commit: f50b8b08b5742c8e55df2d610d428c39cf1f4947
Component: engine
2013-12-28 16:42:18 -08:00
a3a982cef5 Fix typo in working with volumes doc page
Upstream-commit: a17fd7b294e1334788e1812f8cc1a99e5300724b
Component: engine
2013-12-28 20:22:46 +10:00
0cd52002c8 * s/docker/Docker/
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
1a7338c423 Document "name" query parameter for "POST /containers/create" in Remote API v1.8
Upstream-commit: 721bb410f6caa213b7d4eed9373be74287605ffc
Component: engine
2013-12-26 06:43:26 +01:00
4fb94b472a Fixed #3039 - Added clarify on port options in API
Upstream-commit: d2d8a4a6c507bc8e7d591925276d79d89ce6beaf
Component: engine
2013-12-24 13:01:59 -05:00
54063489be Merge pull request #3309 from apocas/master
Wrong HTTP method in events endpoint. (documentation)
Upstream-commit: e1a15b25dc39049c9dc7ded3042422460155ed60
Component: engine
2013-12-23 14:58:49 -08:00
562f5b51cb http method typo in documentation for events endpoint (all api versions)
Upstream-commit: 614bc5c1e1e4f134f9844844ef7d8171c7f0d598
Component: engine
2013-12-23 21:21:01 +00:00
b733ad7e1a Merge pull request #3302 from briandorsey/master
Added a note about a networking work-around.
Upstream-commit: cda24e345cc742f99451e43d71b3dfb49562b2d4
Component: engine
2013-12-23 11:25:20 -08:00
4c6a34d864 Merge pull request #3320 from jamtur01/privapi
API documentation update for Privileged
Upstream-commit: 88037b28779d1a8c98f3bd6d30675fb2a0a70b1e
Component: engine
2013-12-23 11:22:47 -08:00
db836da6cc Minor style cleanups to the API spec docs
Upstream-commit: ea8a3438f769c85725f34c6e51d7c73ed1fff962
Component: engine
2013-12-23 11:45:51 -05:00
93dba8079c API documentation update for Privileged
The 1.7 API docs show the ability to pass Privileged
when creating a container. This is not supported as.
Privileged is now part of hostConfig and can only be
passed when starting a container.

This fixes the documentation issue.
Upstream-commit: bf17383e35afa12f5d6cb145b26542f2dc4f95de
Component: engine
2013-12-23 09:08:28 -05:00
5330cfa4e1 Merge pull request #3308 from crigor/patch-1
Change an to a
Upstream-commit: 1e5f9334e0746399856b8f1e0f7ebd28947bcee8
Component: engine
2013-12-21 15:12:50 -08:00
2bbee621e7 + added missing link in index.rst
* some gramatic and spelling fixes

Thx jamtur :)
Upstream-commit: 3edbf416bfaed2c7bacc3c5ef572efb59b4e2082
Component: engine
2013-12-22 00:00:20 +01:00
05c72ace17 Merge pull request #3272 from SvenDowideit/more-complete-run-cmd-example
A more complete example of docker run.
Upstream-commit: c2364b978de2bae79e96e53e90519ece169cf24f
Component: engine
2013-12-21 14:52:41 -08:00
b028910bf6 Installation for FrugalWare
Upstream-commit: 158e3d60ec016778b2a2615885f6a880509644f3
Component: engine
2013-12-21 23:38:13 +01:00
c6977efcc7 Wrong HTTP method in events endpoint.
Upstream-commit: e4e579b40d79764781cbb0a63d12d307ca8a71dc
Component: engine
2013-12-21 16:41:41 +00:00
f27c5dcccd Change an to a
Upstream-commit: 071528e1033623b4c2da7450b4492616101dd018
Component: engine
2013-12-21 16:23:13 +08:00
652202543c Update MTU work-around to use the new -mtu flag
Upstream-commit: cdd14b1a31603e602ab36522582b4356264ccb60
Component: engine
2013-12-20 16:19:35 -08:00
118dcafff9 Added a note about a networking work around.
An additional flag to limit the networking MTU is required in three Compute Engine zones for reliable networking from inside the docker container. Added a warning to that effect to the QuickStart guide.
Upstream-commit: 37ed178611622da42e3a4a0aed2288b00b4eb208
Component: engine
2013-12-20 16:06:28 -08:00
fd15c72b59 Merge pull request #3289 from crosbymichael/add-mtu-option
Allow mtu to be configured at daemon start
Upstream-commit: aa619de748e2337f6bb7aac62c212811ac709c1e
Component: engine
2013-12-20 13:21:56 -08:00
44050b9219 Allow mtu to be configured at daemon start
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05:00
8afb99df88 make a more complete example of docker run, showing the use of most of the options (Closes #1500)
Upstream-commit: df87919165e8874fe53d9405e3833bbaff4f0147
Component: engine
2013-12-20 20:06:07 +10:00
31ff556216 Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
Update docs to include images for docker inspect
Upstream-commit: efde305c05fe1969b6116f4ee777e5c37d30d139
Component: engine
2013-12-19 14:50:55 -08:00
f4c2be3a58 Update docs to include images for docker inspect
Upstream-commit: 8072d3a4e009f404fbc31507887c3418ea7327fc
Component: engine
2013-12-19 20:55:19 +01:00
b1321196bf Added some more items to the FAQ
Upstream-commit: 8c52140059c83b9ef6f4f9336f162945cd360c4f
Component: engine
2013-12-19 14:27:47 -05:00
5fd54c24bc Use box-drawing characters in docker images -tree
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...

Before:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      |─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      | └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      |   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)

After:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      ├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      │ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      │   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
Upstream-commit: d14c162fd621da809baa48e8af007443c4f2ae0a
Component: engine
2013-12-18 22:30:21 -08:00
5f28e84d16 Merge pull request #3128 from codeaholics/1530-improve-error-message
Improve error message when refusing to remove image due to multiple repo tags
Upstream-commit: 70c7220a990ba522a12baed8d8c7aa06af7f8547
Component: engine
2013-12-17 20:49:25 -08:00
7df1c5a0f0 Merge pull request #3234 from creack/default_unix_path
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
2013-12-17 16:24:01 -08:00
ddd720195c Merge pull request #3228 from maztaim/patch-1
Update binaries.rst
Upstream-commit: f630fbc7cf76fb123efff855de465a140e470754
Component: engine
2013-12-17 13:10:08 -08:00
295882518c Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
Upstream-commit: c4444ce48fac417847f95a11024667d48e715a52
Component: engine
2013-12-17 11:48:21 -08:00
80983f7def Merge pull request #3236 from dhrp/doc-master-warning
Added warning when browsing master. & no longer hides alternative versions
Upstream-commit: 7ba0f1f421fea08728675d9ec424b97ad51cd695
Component: engine
2013-12-17 11:17:17 -08:00
57ff515d90 Merge pull request #3249 from tianon/fix-sphinx-warning
Fix minor sphinx warning
Upstream-commit: 30454bb85ca30cec9e904e75f5d9c4e436d54858
Component: engine
2013-12-17 11:03:44 -08:00
9af351f520 Merge pull request #3248 from lsm5/docker-fedora-conflict
Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine
2013-12-17 11:01:37 -08:00
96dc4ccb26 Removed unnessary span element from version floater and
Replaced social footer by the one from www.docker.io
Upstream-commit: efc0610c0eec78850e0fc1e4f09bb294693a31e5
Component: engine
2013-12-17 10:39:22 -08:00
ab2b80c344 Merge pull request #3221 from jamtur01/introlink
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
2013-12-17 10:36:00 -08:00
2756066cbe Fix minor sphinx warning
Upstream-commit: 81d112cb7fc19e4919f9916c08d8409c74aa117a
Component: engine
2013-12-17 10:38:55 -07:00
2b1ed3c336 Fedora first letter capitalize and misc. rewording
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 25be0b1e987934ca39085894730b54f4bbcd8ad2
Component: engine
2013-12-17 11:32:40 -06:00
3fa358de88 docker and docker-io conflict update for epel
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 30b4a0f76a63f24f96ba588216990f0ae7cd60a2
Component: engine
2013-12-17 10:56:31 -06:00