Commit graph

4566 commits

Author SHA1 Message Date
moxiegirl
3d43ebebfa Merge pull request #18720 from kytrinyx/unspecific-ubuntu
docs: remove ubuntu version in dockerizing userguide
2015-12-19 21:17:38 -08:00
moxiegirl
fa720ad987 Merge pull request #18667 from bboreham/inspect-json-doc
Improved explanation of docker inspect 'json' function
2015-12-19 21:09:39 -08:00
Sebastiaan van Stijn
579d35e33c Update link to Oracle Linux
The https://linux.oracle.com/ url results in
too many redirects, which may result in our
link-checker to think the link is broken.

Replacing the link, per discussion in
https://github.com/docker/docker/pull/18534#issuecomment-164202592

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-20 00:52:12 +01:00
Mary Anthony
55a65e18c0 Fixing typo reported by @projectvalis
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-19 12:47:24 -08:00
Sebastiaan van Stijn
69fbdf4294 Merge pull request #18684 from cdauth/volume-docs
Add note to volume docs that data is not copied to mounted volumes
2015-12-19 15:29:44 +01:00
Sebastiaan van Stijn
eaf7932faf Merge pull request #18769 from runcom/docs-auth-1
docs: extend: authorization.md: add a note about confidential stuff in Err
2015-12-19 14:53:25 +01:00
Antonio Murdaca
5a64c8027e authZ: more fixes
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 16:29:01 +01:00
Antonio Murdaca
1e28f04fec docs: extend: authorization.md: add a note about confidential stuff in Err
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 11:28:28 +01:00
Sebastiaan van Stijn
742fd4fa63 Merge pull request #18739 from wenchma/typo
Fix typo error and update index
2015-12-17 15:43:14 +01:00
Sebastiaan van Stijn
3f4dc49210 Merge pull request #18743 from wenchma/plugin_not_found
Sync the docker network create api docs with the error code
2015-12-17 12:16:23 +01:00
Sebastiaan van Stijn
5baa93c04e Merge pull request #18662 from runcom/pkg-authZ-response
pkg: authorization: add Err to tweak response status code
2015-12-17 11:12:27 +01:00
Antonio Murdaca
46e3a249a1 pkg: authorization: add Err to tweak response status code
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-17 11:08:47 +01:00
Wen Cheng Ma
597835e645 Sync the docker network create api docs with the error code
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-17 17:48:50 +08:00
Vincent Demeester
0f749ad55a Merge pull request #18559 from ahmetalpbalkan/return-container-networks
Proposal: Add container networks list to /containers/json
2015-12-17 10:11:18 +01:00
Wen Cheng Ma
e0db2fa4da Fix typo error and update index
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-17 15:40:10 +08:00
David Calavera
905f3336b2 Merge pull request #15964 from duglin/APIVersion
Add a DOCKER_API_VERSION env var
2015-12-16 14:23:47 -08:00
David Calavera
cd1ace316d Merge pull request #18671 from saturnism/patch-1
Updated REX-Ray plugin platform support.
2015-12-16 14:16:12 -08:00
Katrina Owen
68b07c0af9 docs: remove ubuntu version in dockerizing userguide
The docs/installation/mac guide causes a user to download the
`ubuntu` image, which defaults to `ubuntu:latest`.

After installing the next logical step is to work through
the userguide. If the userguide specifies ubuntu:14.04, then
a second ubuntu image will be downloaded.

On slow internet connections this takes a long time.
The cost of specificity in this case seems higher than the value.

Since this might be the first or second interaction a user has
with docker, they might not realize that they can remove the ":14.04"
bit to use the image that was previously downloaded.

Signed-off-by: Katrina Owen <katrina.owen@gmail.com>
2015-12-16 11:25:15 -07:00
Brian Goff
8f2a15b880 Merge pull request #18703 from runcom/nit-plugins-volume
docs: extend: plugins_volume.md: Err default to empty string
2015-12-16 12:23:34 -05:00
Sebastiaan van Stijn
6f930a2ffa Merge pull request #18700 from mqliang/patch-2
Update dockernetworks.md
2015-12-16 16:58:25 +01:00
Antonio Murdaca
cc62a88524 docs: extend: plugins_volume.md: Err default to empty string
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 09:52:26 +01:00
Liang Mingqiang
f480b7c1f5 Update dockernetworks.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 15:25:06 +08:00
Liang Mingqiang
e1f012cf39 fix typo in dockerlinks.md
fix typo in dockerlinks.md

Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 11:21:39 +08:00
Candid Dauth
efb763aa10 Add note to volume docs that data is not copied to mounted volumes
Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
2015-12-15 20:27:35 +01:00
Brian Goff
ce0b1841c8 Merge pull request #17034 from rhvgoyal/volume-propagation
Capability to specify per volume mount propagation mode
2015-12-15 12:14:41 -05:00
Ray Tsang
22023e05a3 Updated REX-Ray plugin platform support.
REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113

Signed-off-by: Ray Tsang <rayt@google.com>
2015-12-15 11:21:19 -05:00
Liang Mingqiang
4c1243dc76 fixed typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 23:00:47 +08:00
Bryan Boreham
c170e97197 Explain 'json' function a bit better
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-12-15 13:41:47 +00:00
Liang Mingqiang
941bbd57ac fix typo in runmetrics.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 19:14:47 +08:00
Ahmet Alp Balkan
755f8609f6 Add containers’ networks to /containers/json
After addition of multi-host networking in Docker 1.9, Docker Remote
API is still returning only the network specified during creation
of the container in the “List Containers” (`/containers/json`) endpoint:

    ...
    "HostConfig": {
      "NetworkMode": "default"
    },

The list of networks containers are attached to is only available at
Get Container (`/containers/<id>/json`) endpoint.
This does not allow applications utilizing multi-host networking to
be built on top of Docker Remote API.

Therefore I added a simple `"NetworkSettings"` section to the
`/containers/json` endpoint. This is not identical to the NetworkSettings
returned in Get Container (`/containers/<id>/json`) endpoint. It only
contains a single field `"Networks"`, which is essentially the same
value shown in inspect output of a container.

This change adds the following section to the `/containers/json`:

    "NetworkSettings": {
      "Networks": {
        "bridge": {
          "EndpointID": "2cdc4edb1ded3631c81f57966563e...",
          "Gateway": "172.17.0.1",
          "IPAddress": "172.17.0.2",
          "IPPrefixLen": 16,
          "IPv6Gateway": "",
          "GlobalIPv6Address": "",
          "GlobalIPv6PrefixLen": 0,
          "MacAddress": "02:42:ac:11:00:02"
        }
      }
    }

This is of type `SummaryNetworkSettings` type, a minimal version of
`api/types#NetworkSettings`.

Actually all I need is the network name and the IPAddress fields. If folks
find this addition too big, I can create a `SummaryEndpointSettings` field
as well, containing just the IPAddress field.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-12-14 19:03:23 -08:00
Tianon Gravi
226329e540 Remove mention of "apt-get clean" as it's performed automatically
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-12-14 12:50:44 -08:00
Doug Davis
6287ec9095 Add a DOCKER_API_VERSION env var
Closes: #11486

Just for @ahmetalpbalkan  :-)

Fixed some comment formatting too while in there.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-12-14 12:45:34 -08:00
Vivek Goyal
a2dc4f79f2 Add capability to specify mount propagation per volume
Allow passing mount propagation option shared, slave, or private as volume
property.

For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-12-14 10:39:53 -05:00
Justas Brazauskas
927b334ebf Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
Sebastiaan van Stijn
f5e6b09783 Merge pull request #18620 from jeffjohnston/DOC-16770
Update configuring Docker article
2015-12-13 14:10:46 +01:00
moxiegirl
94026969b4 Merge pull request #18389 from wenchma/doc_update_for_container-basics
docs: delete draft container-basics.md
2015-12-12 21:39:34 -08:00
Jeff Johnston
a77861bca7 Update configuring Docker article
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
2015-12-12 20:36:48 -06:00
Antonio Murdaca
1fffc0270f Merge pull request #15365 from twistlock/14674-docker-authz
Docker authorization plug-in infrastructure
2015-12-12 12:30:33 +01:00
Liron Levin
de4ffdfe48 Change authz plugin argument name
Signed-off-by: Liron Levin <liron@twistlock.com>
2015-12-11 20:59:15 +02:00
Dima Stopel
b7af5bcd20 Fixing documentation comments by @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
2015-12-11 07:03:58 +02:00
Sebastiaan van Stijn
23bd9b881f Merge pull request #18577 from devvyn/patch-1
Update custom-docker0.md (corrections)
2015-12-11 02:38:24 +01:00
David Calavera
b89676bead Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device
Fix typo in named test and docs.
2015-12-10 15:19:41 -08:00
Alexander Morozov
ac453a310b Merge pull request #18353 from aaronlehmann/transfer-manager
Improved push and pull with upload manager and download manager
2015-12-10 14:52:48 -08:00
Christopher Jones
7c077c2c34 Fixed typo change deivce to device.
This changes deivce to device in daemon, test and docs.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-10 15:23:05 -06:00
Devvyn Murphy
76de01c138 Update custom-docker0.md (corrections)
Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup).

Signed-off-by: Devvyn Murphy <devvyn@devvyn.com>
2015-12-10 13:24:02 -06:00
Aaron Lehmann
d92e7ad735 Update docs for addition of transfer manager
Closing the HTTP connection requesting a push or pull will cancel the
push or pull. This behavior also applies to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-09 19:13:35 -08:00
Sebastiaan van Stijn
1d775a54cc Merge pull request #18541 from programmerq/inspect_command_ip_address
Add the actual command in this example.
2015-12-09 21:10:46 +01:00
Jeff Anderson
d8d38f2345 Add the actual command in this example.
Signed-off-by: Jeff Anderson <jeff@docker.com>
2015-12-09 10:17:39 -07:00
Sebastiaan van Stijn
d9f4e5c13c docs: fix incorrect package name on Oracle Linux
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-09 14:19:27 +01:00
Qiang Huang
2347f98003 Check minimum kernel memory limit to be 4M
Fixes: #18405

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-09 14:26:41 +08:00