Commit Graph

4543 Commits

Author SHA1 Message Date
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
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
34e0c13d67 fixed typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08: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
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
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
4b66f2a240 Merge pull request #18541 from programmerq/inspect_command_ip_address
Add the actual command in this example.
Upstream-commit: 1d775a54cc67e27f755c7338c3ee938498e845d7
Component: engine
2015-12-09 21:10:46 +01:00
04396c69aa Add the actual command in this example.
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: d8d38f234563a3be0b23cc94df3a9453eacfdee8
Component: engine
2015-12-09 10:17:39 -07:00
b353d85584 docs: fix incorrect package name on Oracle Linux
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d9f4e5c13ccb5c76547937399078784e4e7ed023
Component: engine
2015-12-09 14:19:27 +01:00
8a7da51391 Check minimum kernel memory limit to be 4M
Fixes: #18405

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 2347f98003af34dd1cfd290bf0f2cc7e6ae07b03
Component: engine
2015-12-09 14:26:41 +08:00
1085599321 Merge pull request #18478 from programmerq/novirt
Call it "containerization" instead of "virtualization" in the docs
Upstream-commit: 8ed14c207256836f86308f76d88fc800bb34e5f1
Component: engine
2015-12-08 16:45:29 -08:00
e1e5d41283 Change "virtualization" to "containerization"
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
31c6e57b82 The docs now explain that images with repo:tag as <none>:<none> are dangling images.
Signed-off-by: Sambuddha Basu <sambuddhabasu1@gmail.com>
Upstream-commit: 1bafa3cdcd102041948375643a5e2752ad506e0c
Component: engine
2015-12-08 22:08:29 +04:00
1c96ff9a0b Fixing documentation according to comments by @moxiegirl and @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: 8cc0892269fb532f117aadc0e8acf7a173fe4e1b
Component: engine
2015-12-08 17:34:15 +02:00
2491643ccf Docker authorization plug-in infrastructure enables extending the functionality of the Docker daemon with respect to user authorization. The infrastructure enables registering a set of external authorization plug-in. Each plug-in receives information about the user and the request and decides whether to allow or deny the request. Only in case all plug-ins allow accessing the resource the access is granted.
Each plug-in operates as a separate service, and registers with Docker
through general (plug-ins API)
[https://blog.docker.com/2015/06/extending-docker-with-plugins/]. No
Docker daemon recompilation is required in order to add / remove an
authentication plug-in. Each plug-in is notified twice for each
operation: 1) before the operation is performed and, 2) before the
response is returned to the client. The plug-ins can modify the response
that is returned to the client.

The authorization depends on the authorization effort that takes place
in parallel [https://github.com/docker/docker/issues/13697].

This is the official issue of the authorization effort:
https://github.com/docker/docker/issues/14674

(Here)[https://github.com/rhatdan/docker-rbac] you can find an open
document that discusses a default RBAC plug-in for Docker.

Signed-off-by: Liron Levin <liron@twistlock.com>
Added container create flow test and extended the verification for ps
Upstream-commit: 75c353f0ad73bd83ed18e92857dd99a103bb47e3
Component: engine
2015-12-08 17:34:15 +02:00
db09b58def Adding authorization subsystem documentation
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: 630f695fb1c26ffba03df1cb5059bf592df44e81
Component: engine
2015-12-08 17:32:17 +02:00
8d35d12a65 Merge pull request #18432 from thaJeztah/docs-run-reference-fixups
docs: markdown and textual fixups in reference/run.md
Upstream-commit: 0d8c1a879734029bb9127d2bdabec187c6b4c897
Component: engine
2015-12-08 15:16:51 +01:00
f20b52f333 don't try to use default route MTU as bridge MTU
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: fd9d7c02fcc8edd73d056f56f17e5cfe1760495b
Component: engine
2015-12-07 17:32:51 -05:00
2079ca7585 Update dockervolumes.md
added rm flag to backup/restore commands in examples

Signed-off-by: Ilya Gusev <mail@igusev.ru>
Upstream-commit: 8923c30b4ad304b8ff285afae77bc70b1a2036cc
Component: engine
2015-12-07 15:20:10 +03:00
fde8f24281 Fix pull by digest example
Also reduced the column spacing in the output, so
that more output is visible in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f27572312fd363bcfe43a1ce71c7d225620302ac
Component: engine
2015-12-07 00:58:46 +01:00
4769eb1560 added albatros library
Signed-off-by: dcylabs <dcylabs@gmail.com>
Upstream-commit: a94bede2aa04bbb4f05fcda70f8edfa7917a3238
Component: engine
2015-12-06 20:40:42 +01:00
26496961f2 Merge pull request #17741 from dhiltgen/pull_token
Add token pass-thru for AuthConfig
Upstream-commit: 715f6a135c6787fdb6834a6d167b3adc06943afe
Component: engine
2015-12-06 16:40:06 +01:00
ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
d0e41cba7f docs: fix typo in bash_history mount example
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
Upstream-commit: 655766ed955477299fac95a0fcd60af58f2b5be8
Component: engine
2015-12-04 16:09:25 +01:00
13df21d3ec Merge pull request #18325 from RsrchBoy/topic/newtorks
newtork -> network (minor spelling correction)
Upstream-commit: e3fbd6922fe549755890a205a0b8dd88022d5924
Component: engine
2015-12-04 14:03:55 +01:00
8f7acd99b1 docs: markdown and textual fixups in reference/run.md
This fixes markdown formatting, and formatting of tables;

 - Our markdown engine doesn't support spanning rows, so
   re-wrapped table contents.
 - Added a CSS-styles to prevent "code" blocks in tables
   from wrapping
 - The "logging drivers" table didn't have a header
 - Aligned table borders in source code for better readability.
 - Standardize on using `-it` in stead of -i -t or -ti
 - Some markup issues
 - Some minor textual fixups

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c60c0c4e9b65bd69fd1e1d6ca78bfcb2d7281c87
Component: engine
2015-12-04 13:46:22 +01:00
9e539c7be0 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
d5560ff674 docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
7be0f9667b Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
fa7d79e4ed add docs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 831af89991edd442ef4eeb29fd01da576b04bcfc
Component: engine
2015-12-03 16:30:52 -08:00
9f99937185 Merge pull request #17481 from vdemeester/17446-network-inspect-format
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
a263d7120f Add token pass-thru for AuthConfig
This change allows API clients to retrieve an authentication token from
a registry, and then pass that token directly to the API.

Example usage:

    REPO_USER=dhiltgen
    read -s PASSWORD
    REPO=privateorg/repo
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")

    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    curl -s -D - -H "X-Registry-Auth: ${HEADER}" -X POST "http://localhost:2376/images/create?fromImage=${REPO}"

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 8dce8e9901501863a80caf47d71713d4d36925a3
Component: engine
2015-12-03 11:40:27 -08:00
476079ebd7 Address review comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a2120e5ba3337f70a63fd64ea773e50ce5af31ca
Component: engine
2015-12-03 16:07:54 +01:00