Commit Graph

4570 Commits

Author SHA1 Message Date
f64ebb2c89 Merge pull request #18794 from thaJeztah/EOL-fedora-21
Remove Fedora 21 from RPM build as it is EOL
Upstream-commit: cc6f0df2e41c7d01dffd8e0630c14275960130fc
Component: engine
2015-12-20 11:53:51 +01:00
0e3b79cb4d Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
update syntax for empty value labels
Upstream-commit: 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0
Component: engine
2015-12-19 21:53:21 -08:00
27d8c0709b Merge pull request #18720 from kytrinyx/unspecific-ubuntu
docs: remove ubuntu version in dockerizing userguide
Upstream-commit: 3d43ebebfae82b4c5cf5ce0987d087e7059829aa
Component: engine
2015-12-19 21:17:38 -08:00
bfd2cf3356 Merge pull request #18667 from bboreham/inspect-json-doc
Improved explanation of docker inspect 'json' function
Upstream-commit: fa720ad98746eb33073af9f4fde16df4f774644f
Component: engine
2015-12-19 21:09:39 -08:00
007bebfe87 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>
Upstream-commit: 579d35e33c161fa20bf6cf8d0e41969d9821e378
Component: engine
2015-12-20 00:52:12 +01:00
8d399a7fd9 Remove Fedora 21 from RPM build as it is EOL
Fedora 21 is EOL'd as of December 1st, 2015.

Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html

Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.

Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
ba3901d719 Fixing typo reported by @projectvalis
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 55a65e18c08e2612b5cc7384119e6ec44e476da7
Component: engine
2015-12-19 12:47:24 -08:00
8acdb0b4d5 Merge pull request #18684 from cdauth/volume-docs
Add note to volume docs that data is not copied to mounted volumes
Upstream-commit: 69fbdf4294b9c062bc711b978efcde82e40a293f
Component: engine
2015-12-19 15:29:44 +01:00
3c6477529c Merge pull request #18769 from runcom/docs-auth-1
docs: extend: authorization.md: add a note about confidential stuff in Err
Upstream-commit: eaf7932fafdfdbcefa3be3ccacab016938969cf4
Component: engine
2015-12-19 14:53:25 +01:00
295cafe7dd docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: aada8d81177de793db38845ff3a26949436e1ed6
Component: engine
2015-12-19 09:04:29 +01:00
d63981ab4d 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>
Upstream-commit: 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1
Component: engine
2015-12-18 16:29:01 +01:00
7d0507241f docs: extend: authorization.md: add a note about confidential stuff in Err
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1e28f04fec70affd8fae57f4bdd23a84853f4efc
Component: engine
2015-12-18 11:28:28 +01:00
1dd48fd37d Merge pull request #18739 from wenchma/typo
Fix typo error and update index
Upstream-commit: 742fd4fa633bfb105e501b74cc27871a972e8001
Component: engine
2015-12-17 15:43:14 +01:00
5d75803e83 Merge pull request #18743 from wenchma/plugin_not_found
Sync the docker network create api docs with the error code
Upstream-commit: 3f4dc492102bf4bceea92a59c78439420f7527c9
Component: engine
2015-12-17 12:16:23 +01:00
ce29ee35b2 Merge pull request #18662 from runcom/pkg-authZ-response
pkg: authorization: add Err to tweak response status code
Upstream-commit: 5baa93c04ef4a195df397914baf0a980c93d1271
Component: engine
2015-12-17 11:12:27 +01:00
98eeaeab93 pkg: authorization: add Err to tweak response status code
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 46e3a249a1971f8697ca338c9b02e27d36ddab12
Component: engine
2015-12-17 11:08:47 +01:00
fe1109030f Sync the docker network create api docs with the error code
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 597835e6454be55963959f5f9d586b71517a7f1e
Component: engine
2015-12-17 17:48:50 +08:00
9a50c6c5f4 Merge pull request #18559 from ahmetalpbalkan/return-container-networks
Proposal: Add container networks list to /containers/json
Upstream-commit: 0f749ad55ab794872e601b4f665b07c0be07abfc
Component: engine
2015-12-17 10:11:18 +01:00
290e29f4c7 Fix typo error and update index
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: e0db2fa4da8f4de861ff83e6f19e7e6d4251289d
Component: engine
2015-12-17 15:40:10 +08:00
7c30c7ccac Merge pull request #15964 from duglin/APIVersion
Add a DOCKER_API_VERSION env var
Upstream-commit: 905f3336b2715b3960b5ff4f860db387797d9adf
Component: engine
2015-12-16 14:23:47 -08:00
2dc1c7dfce Merge pull request #18671 from saturnism/patch-1
Updated REX-Ray plugin platform support.
Upstream-commit: cd1ace316df667719da810e2998c72dd2f2ef566
Component: engine
2015-12-16 14:16:12 -08:00
e457303049 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>
Upstream-commit: 68b07c0af947956581b1c3c1692ab5d8f96af73d
Component: engine
2015-12-16 11:25:15 -07:00
c819e8f023 Merge pull request #18703 from runcom/nit-plugins-volume
docs: extend: plugins_volume.md: Err default to empty string
Upstream-commit: 8f2a15b88096b3196356240eac5704a17949a9ea
Component: engine
2015-12-16 12:23:34 -05:00
a99a73ad6e Merge pull request #18700 from mqliang/patch-2
Update dockernetworks.md
Upstream-commit: 6f930a2ffa57b022947743d6f16751a27b93fbed
Component: engine
2015-12-16 16:58:25 +01:00
fb506b92c1 docs: extend: plugins_volume.md: Err default to empty string
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: cc62a88524b623c8f86075d9ed220196cf5e92da
Component: engine
2015-12-16 09:52:26 +01:00
b6343dc716 Update dockernetworks.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
86c606852c fix typo in dockerlinks.md
fix typo in dockerlinks.md

Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: e1f012cf397f170e12443e4993c09171791d37db
Component: engine
2015-12-16 11:21:39 +08:00
0515ab43ec Add note to volume docs that data is not copied to mounted volumes
Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
Upstream-commit: efb763aa10187e049fc6854e5a97efc410fcd214
Component: engine
2015-12-15 20:27:35 +01:00
2a2006ef18 Merge pull request #17034 from rhvgoyal/volume-propagation
Capability to specify per volume mount propagation mode
Upstream-commit: ce0b1841c82b6972d96654e083f813944e72443f
Component: engine
2015-12-15 12:14:41 -05:00
6cfc285ba0 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>
Upstream-commit: 22023e05a319c60af2bc2c2f30ade8fa1f6f33fe
Component: engine
2015-12-15 11:21:19 -05:00
34e0c13d67 fixed typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
e621a10208 Explain 'json' function a bit better
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: c170e971977d32f16916d1189c5755c79e36fc56
Component: engine
2015-12-15 13:41:47 +00:00
0b8410bce0 fix typo in runmetrics.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 941bbd57ac26d77ecf651b8e418c6ed8f08b39bd
Component: engine
2015-12-15 19:14:47 +08:00
b07ebd0f2f 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>
Upstream-commit: 755f8609f699a20cb47ec7269e3a9469541a9419
Component: engine
2015-12-14 19:03:23 -08:00
899c6bfe77 Remove mention of "apt-get clean" as it's performed automatically
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 226329e54031256958740af0ae5bc1a4f2cd9c2e
Component: engine
2015-12-14 12:50:44 -08:00
6a842265ad 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>
Upstream-commit: 6287ec9095f380449f0b4f1a06d4e5df43fc4449
Component: engine
2015-12-14 12:45:34 -08:00
c0860c6bed 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>
Upstream-commit: a2dc4f79f260247afe55ab7117c9de02a769d883
Component: engine
2015-12-14 10:39:53 -05:00
3c4fcf6b7a Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
7a127054c1 Merge pull request #18620 from jeffjohnston/DOC-16770
Update configuring Docker article
Upstream-commit: f5e6b09783b592c67631e77c43c81e996a3971c3
Component: engine
2015-12-13 14:10:46 +01:00
22a82ca57b Merge pull request #18389 from wenchma/doc_update_for_container-basics
docs: delete draft container-basics.md
Upstream-commit: 94026969b43fddee3fbf35e5888dee006a14e098
Component: engine
2015-12-12 21:39:34 -08:00
0364b03cd5 Update configuring Docker article
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
Upstream-commit: a77861bca7b93489dc3d804ef816b0070dbb678e
Component: engine
2015-12-12 20:36:48 -06:00
1d681e5873 Merge pull request #15365 from twistlock/14674-docker-authz
Docker authorization plug-in infrastructure
Upstream-commit: 1fffc0270ffb56d99a8440a10a0effdb3acd934d
Component: engine
2015-12-12 12:30:33 +01:00
f09e1890f6 Change authz plugin argument name
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: de4ffdfe488494c9c300a785ad4f2263c6182988
Component: engine
2015-12-11 20:59:15 +02:00
a88be4a01d Fixing documentation comments by @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: b7af5bcd20b64e7481538490a0ee1d844f5a462e
Component: engine
2015-12-11 07:03:58 +02:00
98c3f4897a Merge pull request #18577 from devvyn/patch-1
Update custom-docker0.md (corrections)
Upstream-commit: 23bd9b881fd4a04d3f363d4d5205f7ac63a904e5
Component: engine
2015-12-11 02:38:24 +01:00
87797addd5 Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device
Fix typo in named test and docs.
Upstream-commit: b89676beadce5a078dd8fc8b37ce00729e6e7232
Component: engine
2015-12-10 15:19:41 -08:00
9847131043 Merge pull request #18353 from aaronlehmann/transfer-manager
Improved push and pull with upload manager and download manager
Upstream-commit: ac453a310bac6bdd7cd9d780a63d4168064570d1
Component: engine
2015-12-10 14:52:48 -08:00
1aaaffc214 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>
Upstream-commit: 7c077c2c3443fdb9b13b7790bc96cdaa287cf381
Component: engine
2015-12-10 15:23:05 -06:00
443714c6b5 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>
Upstream-commit: 76de01c13833e42c89afa7e46d97bb4864a9be9b
Component: engine
2015-12-10 13:24:02 -06:00
32056292f5 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>
Upstream-commit: d92e7ad7356e10c86e7dc479356578ac40fd2bbd
Component: engine
2015-12-09 19:13:35 -08:00