Commit graph

6400 commits

Author SHA1 Message Date
Cezar Sa Espinola
7bd2611789
Add --health-* commands to service create and update
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
2016-10-28 15:19:08 -02:00
yuexiao-wang
2d99344d3c Add --format to man and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-28 22:31:20 +08:00
yuexiao-wang
4d2af44300 Fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-29 00:46:16 +08:00
Akihiro Suda
18768fdc2e api: add TypeTmpfs to api/types/mount
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-28 08:38:32 +00:00
Vincent Demeester
89011970e0 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
Add -q option to `docker service ps`
2016-10-28 05:21:03 +02:00
lixiaobing10051267
7d1eb5ea1b fill all the rest invalid address because no related directory
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-28 11:12:54 +08:00
lixiaobing10051267
97c00f9754 fill the complete address because of no userguide directory
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-28 10:57:37 +08:00
Ce Gao
9efa472bd1 fixes #27643
Signed-off-by: Ce Gao <ce.gao@outlook.com>
2016-10-28 08:02:57 +08:00
Sebastiaan van Stijn
3a3a87bff8 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Remove service update name flag
2016-10-27 16:55:47 -07:00
Yong Tang
ee3105c68a Add --env-file flag to docker create service
This fix tries to address the issue in 24712 and add
`--env-file` file to `docker create service`.

Related documentation has been updated.

An additional integration has been added.

This fix fixes 24712.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-27 11:48:32 -07:00
Sebastiaan van Stijn
047e44eeb1 Remove --name flag from service update
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-27 09:16:29 -07:00
Erik St. Martin
56f77d5ade Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
2016-10-26 11:33:06 -04:00
Harshal Patil
784fa222c6 Putting back the missing image back in the repo.
Signed-off-by: Harshal Patil <harshalp@linux.vnet.ibm.com>
2016-10-26 12:34:24 +05:30
Sebastiaan van Stijn
a6dfab03f5 Merge pull request #27764 from elgalu/patch-1
Typo --ti and missing my_strace_docker_image
2016-10-25 22:46:04 -07:00
Sebastiaan van Stijn
62ff3e9083 Merge pull request #27702 from tonistiigi/net-builder0
add --network option for docker build
2016-10-25 21:50:33 -07:00
Leo Gallucci
a5b69faafb Typo --ti and missing my_strace_docker_image
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
2016-10-26 06:07:42 +02:00
sandyskies
60813af7ae add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-25 10:25:36 -07:00
Vincent Demeester
11cd64f0dc Merge pull request #27525 from AkihiroSuda/prune-network-cluster
add `docker network prune`
2016-10-25 09:02:28 -07:00
Akihiro Suda
7e24c16086 add docker network prune
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-25 06:43:54 +00:00
Akihiro Suda
2c288e60db update docs/reference/commandline/network_inspect.md
The following sentences (introduced in v1.11 via #21160) were misleading for Swarm mode services (>= v1.12)

  For networks backed by multi-host network driver, such as Overlay,
  this command also shows the container endpoints in other hosts in the
  cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-25 02:46:59 +00:00
Sebastiaan van Stijn
411e7b4416 Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys
Remove duplicate keys in labels of `docker info`
2016-10-24 18:12:28 -07:00
Kenfe-Mickael Laventure
7781a1bf0f Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-24 15:20:01 -07:00
Vincent Demeester
96efb2cf25 Merge pull request #27578 from yuexiao-wang/update-network
Fix the incorrect links in the document about network and service
2016-10-24 08:05:04 -07:00
yuexiao-wang
49e8c3d8d0 Fix the incorrect links in the document about network and service
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-24 22:01:38 +08:00
Sebastiaan van Stijn
b2786a3888 Merge pull request #27546 from yuexiao-wang/fix-subtitle
Update the subtitle for stack ps
2016-10-23 22:28:43 -07:00
Vincent Demeester
9058ec3be5 Merge pull request #27596 from aaronlehmann/rolling-restart
Add force option to service update
2016-10-22 13:37:12 +02:00
Aaron Lehmann
c9fdf9abf8 Add force option to service update
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-21 17:43:27 -07:00
Sebastiaan van Stijn
2e0d6e6be2
Update cURL example for cURL 7.40 differences
cURL 7.50 changed the validation for URL's
when using socket connections. cURL 7.4x
did not expect a hostname, whereas cURL
7.5x and above _requires_ a hostname.

See https://github.com/curl/curl/issues/936

This updates the example to take both
versions into account, because cURL 7.4x
is still widely used by distros.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-21 11:40:58 -07:00
Gerwim
587b186f85 Update docker_remote_api.md
See https://github.com/docker/docker/issues/26099#issuecomment-245007539

Signed-off-by: Gerwim Feiken <g.feiken@tfe.nl>
2016-10-21 11:34:08 -07:00
Misty Stanley-Jones
78dae2a037 Merge pull request #27575 from yuexiao-wang/fix-cli-link
Modify the links for docker container commands
2016-10-21 11:15:57 -07:00
yuexiao-wang
98fb1644c2 Update the subtitle for stack ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-21 16:47:21 +08:00
Sebastiaan van Stijn
44dc9ef602 Merge pull request #27617 from lixiaobing10051267/masterUserGuide
fix wrong location for network related doc files
2016-10-20 22:28:43 -07:00
lixiaobing10051267
c026076658 fix wrong location for network related doc files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-21 11:27:24 +08:00
Sebastiaan van Stijn
015c2d32ee Merge pull request #27531 from AkihiroSuda/nit-api125-changelog
[nit] add missing changes in API v1.25 (prune) to docker_remote_api.md
2016-10-20 19:37:15 -07:00
Victor Vieux
d98f995d7d Merge pull request #27564 from mlaventure/add-networks-format-to-ps
Add Networks placeholder to ps --format
2016-10-20 18:43:46 -07:00
Akihiro Suda
afb2177631 add missing changes in API v1.25 (prune) to docker_remote_api.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-21 01:33:08 +00:00
Sebastiaan van Stijn
76200f1d0b Merge pull request #27593 from mstanleyjones/improve_develop_plugins
Rewrites to Developing Plugins topic
2016-10-20 15:55:42 -07:00
Misty Stanley-Jones
b39e65e937 Rewrites to Developing Plugins topic
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 15:03:41 -07:00
Misty Stanley-Jones
790629c021 Merge pull request #27560 from mstanleyjones/sync_docs_master
Sync docker/docker refs with files mistakenly edited in docker.github.io repo
2016-10-20 13:42:40 -07:00
Vincent Demeester
13fd75c3dd Merge pull request #27470 from runcom/expose-exec-pid
record pid of exec'd process
2016-10-20 21:36:21 +02:00
Alexander Morozov
c18fbc9455 Merge pull request #22337 from allencloud/support-insecure-registry-config-reload
support insecure registry in configuration reload
2016-10-20 11:41:23 -07:00
Misty Stanley-Jones
3b36f02c03 Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 10:51:30 -07:00
allencloud
c37d6bf2a0 change created description in api change
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-21 00:10:16 +08:00
Antonio Murdaca
1808348136
record pid of exec'd process
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-20 17:06:11 +02:00
yuexiao-wang
e5e1729698 Modify the links for docker container commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-20 22:52:20 +08:00
Kenfe-Mickael Laventure
a43d9bb9c3 Add Networks placeholder to ps --format
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-20 07:41:56 -07:00
Yong Tang
9ce8aac55e Show volume options for docker volume inspect
This fix tries to address the issue raised in 25545 where
volume options at the creation time is not showed up
in `docker volume inspect`.

This fix adds the field `Options` in `Volume` type and
persist the options in volume db so that `volume inspect`
could display the options.

This fix adds a couple of test cases to cover the changes.

This fix fixes 25545.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-20 05:14:27 -07:00
Vincent Demeester
1b677816f5 Merge pull request #24594 from jwendell/24355
Exec: Add ability to set environment variables
2016-10-20 13:26:48 +02:00
Sebastiaan van Stijn
adaea58b20 Merge pull request #27534 from yuexiao-wang/fix-link-image-repo
Update the link for sharing images via repositories
2016-10-19 20:37:22 -07:00
allencloud
582803f00a support insecure registry in configuration reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-20 07:54:31 +08:00
yuexiao-wang
e1c849cc57 Update the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-20 01:39:41 +08:00
Misty Stanley-Jones
2bf4a39161 Merge pull request #27438 from yuexiao-wang/update-volume
Update the link for understand data volumes
2016-10-19 09:56:05 -07:00
yuexiao-wang
b1c2d425e1 Update the link for understand data volumes
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-20 01:25:59 +08:00
Vincent Demeester
4a4f028c47 Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon
Add config parameter to change stop timeout during daemon shutdown
2016-10-19 18:47:50 +02:00
Jonh Wendell
e03bf1221e Exec: Add ability to set environment variables
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
2016-10-19 12:39:25 -02:00
Vincent Demeester
f279c11a77 Merge pull request #26130 from AkihiroSuda/networkcreationtime
add creation timestamp to `docker network inspect`
2016-10-19 15:48:29 +02:00
lixiaobing10051267
9146ac50c4 Remove invalid installtion content because there is no corresponding files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-19 15:12:55 +08:00
Akihiro Suda
b5bb7de5d2 add creation timestamp to docker network inspect
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-19 06:38:39 +00:00
Aaron Lehmann
6d4b527699 Service update failure thresholds and rollback
This adds support for two enhancements to swarm service rolling updates:

- Failure thresholds: In Docker 1.12, a service update could be set up
  to either pause or continue after a single failure occurs. This adds
  an --update-max-failure-ratio flag that controls how many tasks need to
  fail to update for the update as a whole to be considered a failure. A
  counterpart flag, --update-monitor, controls how long to monitor each
  task for a failure after starting it during the update.

- Rollback flag: service update --rollback reverts the service to its
  previous version. If a service update encounters task failures, or
  fails to function properly for some other reason, the user can roll back
  the update.

SwarmKit also has the ability to roll back updates automatically after
hitting the failure thresholds, but we've decided not to expose this in
the Docker API/CLI for now, favoring a workflow where the decision to
roll back is always made by an admin. Depending on user feedback, we may
add a "rollback" option to --update-failure-action in the future.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 10:09:50 -07:00
Misty Stanley-Jones
668189e7f0 Merge pull request #27435 from yuexiao-wang/fix-link
Fix a link for feature deprecation policy
2016-10-18 10:04:42 -07:00
Yong Tang
d7be6b2deb Add config parameter to change stop timeout during daemon shutdown
This fix tries to add a daemon config parameter `--shutdown-timeout`
that specifies the timeout value to stop containers gracefully
(before SIGKILL). The default value is 15s.

The `--shutdown-timeout` parameter is added to daemon options and
config file. It will also be updated during daemon reload.

Additional test cases have been added to cover the change.

This fix fixes #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-18 08:07:50 -07:00
yuexiao-wang
c76f8ff1d4 Fix the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-18 22:59:18 +08:00
Yong Tang
e4c9079d09 Remove duplicate keys in labels of docker info
This fix tries to address the issue raised in 24392 where
labels with duplicate keys exist in `docker info`, which
contradicts with the specifications in the docs.

The reason for duplicate keys is that labels are stored as
slice of strings in the format of `A=B` (and the input/output).

This fix tries to address this issue by checking conflict
labels when daemon started, and remove duplicate labels (K-V).

The existing `/info` API has not been changed.

An additional integration test has been added to cover the
changes in this fix.

This fix fixes 24392.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-18 07:45:27 -07:00
Vincent Demeester
20be0a6ef7 Merge pull request #27434 from danix800/fix-doc-typos
Fix typos in docs/reference/builder.md.
2016-10-18 15:08:01 +02:00
Vincent Demeester
043192137f Merge pull request #27481 from yuexiao-wang/fix-link-image-repo
Fix the link for sharing images via repositories
2016-10-18 14:54:34 +02:00
Justin Cormack
1feaeac65c Merge pull request #27476 from yuexiao-wang/fix-typos-volume
Fix some typos
2016-10-18 13:50:20 +01:00
Justin Cormack
1643110ef4 Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers
wrap line in deleted containers when pruning
2016-10-18 13:48:44 +01:00
Vincent Demeester
dad8cbfc2d Merge pull request #22566 from yongtang/22471-daemon-shutdown-timeout
Add config parameter to change per-container stop timeout during daemon shutdown
2016-10-18 14:33:09 +02:00
yuexiao-wang
7dad9d5ce4 Fix typs from go to Go
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-18 19:40:16 +08:00
Ding Fei
08fe24c2d5 Fix code block fences and typo.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
2016-10-18 18:05:37 +08:00
Ding Fei
9ccb1f159e Fix typos in docs/reference/builder.md.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
2016-10-18 18:05:37 +08:00
yuexiao-wang
b7d34e1c03 Fix link for feature deprecation policy
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-18 17:56:58 +08:00
allencloud
dcb4d68092 wrap line in deleted containers when pruning
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-18 14:20:12 +08:00
Kenfe-Mickaël Laventure
0268efc48b Merge pull request #27440 from lixiaobing10051267/masterVolume
fix wrong output title for docker volume ls
2016-10-17 14:34:24 -07:00
Yong Tang
e66d210891 Add config parameter to change per-container stop timeout during daemon shutdown
This fix tries to add a flag `--stop-timeout` to specify the timeout value
(in seconds) for the container to stop before SIGKILL is issued. If stop timeout
is not specified then the default timeout (10s) is used.

Additional test cases have been added to cover the change.

This fix is related to #22471. Another pull request will add `--shutdown-timeout`
to daemon for #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-17 12:28:46 -07:00
Sebastiaan van Stijn
f302226a5b Merge pull request #27429 from thaJeztah/update-api-changelog
Add KernelMemory to API changelog
2016-10-17 11:11:00 -07:00
Sebastiaan van Stijn
92e2a62891 Merge pull request #27452 from lucafavatella/fix-typo-in-build-ref
Fix typo in build documentation
2016-10-17 10:53:36 -07:00
Michael Crosby
8863a9f62c Merge pull request #24771 from aquasecurity/xfs_quota
Implement XFS quota for overlay2
2016-10-17 09:23:42 -07:00
Luca Favatella
6dbd1e952b Fix typo in build documentation
Signed-off-by: Luca Favatella <luca.favatella@erlang-solutions.com>
2016-10-17 16:48:25 +01:00
lixiaobing10051267
43023a5428 fix wrong output titile for docker volume ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-10-17 17:58:58 +08:00
Sebastiaan van Stijn
ff405a1d2b
Remove Fedora 22 from RPM build as it is EOL
Fedora 22 reached end of life on July 19th, and
will no longer receive updates;

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-16 21:13:26 -07:00
Sebastiaan van Stijn
8e02b29d24
Improve API format examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-16 19:54:08 -07:00
Sebastiaan van Stijn
f988a9ce5e
Add KernelMemory to API changelog
Commit 9bd8a9b66b
added KernelMemory to the API, but forgot
to include this in the API changelog.

This adds the missing entry in the API
changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-16 19:42:35 -07:00
Sebastiaan van Stijn
441c9411e3
Improve example for env vars in API docs
This was added in e41de3e631,
but can be a bit confusing due to the "outer" brackets
being for JSON, and the "inner" brackets to indicate
optional values.

During review of that change, this alternative
format was suggested.

Updating the example to use the format that was discussed
during review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-16 19:22:42 -07:00
milindchawre
72dd684c88 Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field
Signed-off-by: milindchawre <milindchawre@gmail.com>
2016-10-15 08:38:33 +00:00
Ryan Zhang
59357bab8c Restore Docker logo in README.md
Signed-off-by: Ryan Zhang <ryan.zhang@docker.com>
2016-10-14 16:12:27 -07:00
Misty Stanley-Jones
b30609446d Convert Markdown frontmatter to YAML
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-14 15:44:55 -07:00
Misty Stanley-Jones
fba04ed0ab Merge pull request #27332 from mstanleyjones/27297
Remove contents of docs/ except for reference, point to new location
2016-10-14 14:12:09 -07:00
Misty Stanley-Jones
3aeaa9f8fd Add a link to the new build instructions
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-14 14:05:48 -07:00
Sebastiaan van Stijn
e8e1c4dfb9 Merge pull request #27363 from tealtail/26227-add-stack-ps-to-docs
add documentation for `docker stack ps`, Fixes #26227
2016-10-14 10:02:26 -07:00
Sebastiaan van Stijn
dd383898cd Merge pull request #26795 from darrenstahlmsft/PauseResume
Implement Pause Resume support for Windows
2016-10-13 18:08:11 -07:00
Alicia Lauerman
970ab9a224 add documentation for docker stack ps
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
2016-10-13 15:09:58 -04:00
Sebastiaan van Stijn
0542dcc2d0 Merge pull request #27207 from tonistiigi/deprecate-repo-shortid
Deprecate repo:shortid syntax
2016-10-12 23:44:38 -07:00
John Mulhausen
29f08cf49b Remove old documentation, add README.md with pointer
Signed-off-by: John Mulhausen <john@docker.com>
2016-10-12 16:23:33 -07:00
Darren Stahl
69985e85d3 Implement Pause Resume support for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-11 16:23:35 -07:00
Yong Tang
a68047fe68 Update docs for Size and RefCount for UsageData
In 27294, `Size` and `RefCount` has been wrapped into `UsageData`
and is only exposed in `GET system/df`. Though the docs was not
updated in `docker_remote_api_v1.25.md`.

This fix updates the docs to refect the changes for `UsageData`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-11 15:41:00 -07:00
Sebastiaan van Stijn
f65bf11e26 Merge pull request #26894 from thaJeztah/improve-log-level-help
Improve --log-level help text
2016-10-11 12:35:42 +02:00
Sebastiaan van Stijn
ef52468fb9 Merge pull request #27252 from startling/more-obsolete-and-gated-by-syscalls
More obsolete and "gated-by"s in docs/security/seccomp.md
2016-10-10 23:16:44 +02:00
Sebastiaan van Stijn
3197b312d0 Improve --log-level help text
This information was added in
1efc940e6f,
but removed again in
a271eaeba2
to make the help-output fit in a 80-chars
terminal.

This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-10 23:10:17 +02:00
Justin Cormack
199e19548e Add support for ambient capabilities
Linux kernel 4.3 and later supports "ambient capabilities" which are the
only way to pass capabilities to containers running as a non root uid.

Previously there was no way to allow containers not running as root
capabilities in a useful way.

Fix #8460

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-10 19:29:02 +01:00
Sebastiaan van Stijn
4a68c98d70 Merge pull request #27179 from dragonndev/master
Documentation update for trust sandbox example
2016-10-10 19:54:39 +02:00
yuexiao-wang
6396c62fdc Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-11 00:13:33 +08:00
Lizzie Dixon
7e84a1aebd
More obsolete and "gated-by"s in docs/security/seccomp.md
Have used "obsolete" is "pre-2.6".

These are all sourced from the manpages.

Signed-off-by: Lizzie Dixon <_@lizzie.io>
2016-10-10 01:55:56 -07:00
yuexiao-wang
4b61b18ed2 Fix the incorrect links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-10 23:26:05 +08:00
Vincent Demeester
febf53d91a Merge pull request #26996 from Microsoft/jjh/imageinspectosversion
(Windows) Inspect image populate OSVersion
2016-10-07 18:33:01 +02:00
Vincent Demeester
b3cc3d7bf9 Merge pull request #23389 from Microsoft/jjh/credentialspec
Windows: Support credential specs
2016-10-07 18:32:44 +02:00
Vincent Demeester
91312f71aa Merge pull request #26882 from runcom/proxy-path
Specify userland proxy path
2016-10-07 09:44:39 +02:00
Tonis Tiigi
5fc71599a0 Deprecate repo:shortid syntax
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-06 17:12:17 -07:00
John Howard
b7f537e811 Inspect populate image OSVersion
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 11:46:24 -07:00
John Howard
e85867cb68 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 09:32:22 -07:00
Antonio Murdaca
dd2e1947dc
daemon: add --userland-proxy-path flag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-06 17:31:53 +02:00
Matthew Lapworth
0a43c5fedb
Fixed issue when running trust example where the notary server tag wasn't found.
Signed-off-by: Matthew Lapworth <matthewl@bit-shift.net>
2016-10-05 21:05:17 -07:00
Alexander Morozov
f08a450ad3 Merge pull request #25837 from reaperhulk/support-compressing-build-context
Add support for compressing build context during image build
2016-10-05 12:57:46 -07:00
Victor Vieux
bd99641466 Revert "fix API doc service delete"
This reverts commit a12120e78c.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-01 02:12:41 -07:00
Victor Vieux
a12120e78c fix API doc service delete
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-30 22:31:40 -07:00
allencloud
ea07ef7a7c make remove network return 204
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-01 19:50:40 +08:00
Arnaud Porterie
86de7c000f Merge pull request #26108 from mlaventure/data-mngt
New Data Management commands
2016-10-01 03:17:18 +00:00
Paul Kehrer
4825e58a96 Add support for compressing build context during image build
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
2016-09-30 17:46:08 -05:00
Kenfe-Mickael Laventure
913e5cb77b Add documentation for container, volume, image and system prune subcommands
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
a860d5db45 Document new /system/df and /{containers,volumes,images}/prune API EndPoints
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-30 14:35:23 -07:00
Yong Tang
c326e0afe3 Update docs for node filter of docker service ps
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-30 05:37:14 -07:00
Misty Stanley-Jones
9e01221048 Fix menu position of the labels-custom-metadata.md topic
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-29 10:51:08 -07:00
Misty Stanley-Jones
23207def7c Revert "Add direct link to event chart image"
This reverts commit 86de72fef2.

The link seems malformed and is breaking the overall docs build.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-29 10:16:41 -07:00
Vincent Demeester
b6ad6d98fd Merge pull request #24411 from vdemeester/24393-ps-filter-managed
Add a new "is-task" ps filter
2016-09-29 18:54:15 +02:00
Misty Stanley-Jones
ca04f02d76 Fix link to non-existent file
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-28 20:34:26 -07:00
Sebastiaan van Stijn
9f0593990f Merge pull request #26941 from runcom/docker-init-path-1
configure docker-init binary path
2016-09-28 13:12:59 +02:00
Vincent Demeester
5280ba83e5
Add a new "is-task" ps filter
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-09-28 12:45:30 +02:00
Vincent Demeester
b0e1b8fc79 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
2016-09-28 11:50:27 +02:00
Yong Tang
880a5f565f Update docs for service ps
This fix updates docs for `service ps` as now the TASK ID part has been
removed.

Also, this fix fixes several incorrect sample output.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-27 19:12:48 -07:00
Misty Stanley-Jones
bab64af2ad Merge pull request #26931 from thaJeztah/fix-aux-address-example
Fix incorrect aux-address examples and test
2016-09-27 17:06:01 -07:00
Victoria Bialas
0a76a4cb5b added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-09-27 14:21:17 -07:00
Vincent Demeester
97d4b9c465 Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
make client side know container removal in progress
2016-09-27 18:48:03 +02:00
Vincent Demeester
b881148385 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
2016-09-27 18:46:51 +02:00
Vincent Demeester
64fca34860 Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
move macvlan out of experimental docs
2016-09-27 18:45:00 +02:00
Vincent Demeester
c505486bb1 Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
add endpoint mode in service pretty
2016-09-27 18:28:43 +02:00
Antonio Murdaca
6a12685bb7
configure docker-init binary path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-27 14:49:17 +02:00
allencloud
70bb832060 add endpoint mode in service pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-27 18:41:19 +08:00
allencloud
9a58f298d1 make client side know container removal in progress
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-27 18:06:54 +08:00
Sebastiaan van Stijn
fd7161bb30
Fix incorrect aux-address examples and test
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
6ad4bf0a53 API return network-list if no network-name or id is provided
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.

This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).

Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-26 21:44:34 +02:00
Sebastiaan van Stijn
afd22d27c3 Merge pull request #26902 from yuexiao-wang/add-index
Add menu for How PKI works
2016-09-26 21:20:30 +02:00
Sebastiaan van Stijn
a4dd51a660 Merge pull request #23886 from AkihiroSuda/stackcli
add `docker stack ls`
2016-09-26 21:19:04 +02:00
Arnaud Porterie
7944480dd0 Merge pull request #26839 from tonistiigi/build-cache
Implement build cache based on history array
2016-09-26 17:31:49 +00:00
Sebastiaan van Stijn
2a8b556ea5 Merge pull request #26907 from yuexiao-wang/fix-typo
Fix typo for how pki works
2016-09-26 11:58:19 +02:00
Sebastiaan van Stijn
7a6b99aef6 Merge pull request #26908 from yuexiao-wang/fix-link
Fix the broken link
2016-09-26 11:54:36 +02:00
Sebastiaan van Stijn
c8a19aee09 Merge pull request #26892 from ripcurld00d/stats_format_docs
Add documentation for docker stats --format
2016-09-26 10:52:01 +02:00
yuexiao-wang
cfb07e642d Fix the broken link
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-26 15:03:56 +08:00
yuexiao-wang
bf9c6d3115 Fix typo for how pki works
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-26 14:28:31 +08:00
Boaz Shuster
9c7b3040cc Add documentation for docker stats --format
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-09-26 09:26:48 +03:00
yuexiao-wang
c228931384 Add menu for How PKI works
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-26 14:17:47 +08:00
John Howard
c4e1697274 Add isolation to info
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-23 12:13:29 -07:00
Tõnis Tiigi
690882c2e7 Implement build cache based on history array
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
2016-09-23 11:30:06 -07:00
Phil Estes
57f0164fd2 Merge pull request #26834 from thaJeztah/deprecate-docker-daemon
Deprecate "daemon" subcommand
2016-09-23 08:51:18 -04:00
Vincent Demeester
72f556a9ff Merge pull request #26516 from yongtang/26453-build-bad-syntax
Check bad syntax on dockerfile before building.
2016-09-23 12:24:20 +02:00
lixiaobing10051267
392aae44fd the network id is not consistant with the real id created
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-23 17:40:55 +08:00
Sebastiaan van Stijn
a70e6dfe80 Merge pull request #26850 from YuPengZTE/devDot
Del the extra dot
2016-09-23 10:10:11 +02:00
Vincent Demeester
c03c80b1b0 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
support docker node ps multiNodes
2016-09-23 09:50:24 +02:00
YuPengZTE
73770c00fc Del the extra dot
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-23 15:22:52 +08:00
Sebastiaan van Stijn
7a789c5205 Merge pull request #26813 from Starefossen/patch-2
docs: add missing 'on' in Oracle installation guide
2016-09-23 09:14:59 +02:00
Sebastiaan van Stijn
bf58dd82c3
Deprecate "daemon" subcommand
The daemon is in a separate (dockerd) binary
since docker 1.12, so should no longer be
used.

This marks the command as deprecated, and
adds it to the deprecated features list.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-23 00:26:27 +02:00
Sebastiaan van Stijn
c53efdf4c1
Add missing API docs for "privileged" and "user" exec
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.

This adds the missing API docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-22 23:40:05 +02:00
Yong Tang
e33dea5b40 Update documentation and change log to include the preliminary validation of dockerfile.
This commit updates documentation and change log to include
the preliminary validation of the dockerfile before instructions
in dockerfile is run one-by-one.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-22 14:33:37 -07:00
Akihiro Suda
5ce08ddfca add docker stack ls
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-22 19:31:39 +00:00
Hans Kristian Flaatten
838fe65e53
docs: add missing 'on' in Oracle installation guide
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
2016-09-22 14:34:25 +02:00
Vincent Demeester
d9aec43a16 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
Remove engine-api leftovers
2016-09-22 09:39:27 +02:00
Amir Goldstein
05bac4591a overlay2: add support for --storage-opt size
Allow passing --storage-opt size=X to docker create/run commands
for the `overlay2` graphriver.

The size option is only available if the backing fs is xfs that is
mounted with the `pquota` mount option.
The user can pass any size less then the backing fs size.

Signed-off-by: Amir Goldstein <amir73il@aquasec.com>
2016-09-22 07:03:14 +03:00
Sebastiaan van Stijn
c5f4a1ab19 Merge pull request #26413 from lixiaobing10051267/masterLabel
Labels info ommitted while inspecting self-defined network
2016-09-22 02:07:53 +02:00
Sebastiaan van Stijn
ca1b8b30cf Merge pull request #26260 from mstanleyjones/26125_swarm_leave_force
Clarify usage of --force when used on a swarm manager
2016-09-22 00:11:32 +02:00
Misty Stanley-Jones
5c4c062ffc Restructure content about Docker object labels
A few points of work:

- Took the topic out of the left-hand nav and made it
  reachable from the User guide intro

- Condensed the topic's contents, presenting only conceptual
  info and pointing instead to the command-line references
  for each type of object

- Added brief information about the `LABELS` keyword to the
  Dockerfile reference

A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-21 13:20:32 -07:00
Misty Stanley-Jones
7b5c3d935a Clarify usage of --force when used on a swarm manager
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-21 13:05:33 -07:00
Jeff Silberman
da2159ea1c Add Portworx Volume Plugin Description
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
2016-09-21 09:24:32 -07:00
Sebastiaan van Stijn
45818d6fc4
Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
Sebastiaan van Stijn
708892c403
Update API docs for "HostConfig.Binds"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 17:41:59 +02:00
Brian Goff
5fa94084ac Merge pull request #26741 from thaJeztah/fix-api-docs
Fix incorrectly named API options
2016-09-20 09:14:08 -04:00
Vincent Demeester
00615efced Merge pull request #25025 from cpuguy83/service_inspect_formatter
Add formatter for service inspect
2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
36a25bdbe4
Fix incorrectly named API options
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 13:51:55 +02:00
Sebastiaan van Stijn
374ae5ce13 Merge pull request #26732 from yuexiao-wang/update-index
Update on index reference documentation
2016-09-20 11:42:17 +02:00
yuexiao-wang
0483d77613 Update on index refernce documentation
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-20 16:37:52 +08:00
Vincent Demeester
a43691d645 Merge pull request #26482 from yuexiao-wang/add-option
Update the options for docker client
2016-09-20 09:51:57 +02:00
Michael Crosby
ee3ac3aa66 Add init process for zombie fighting
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-19 17:33:50 -07:00
Brian Goff
54ba82beab Add formatter for service inspect
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
920cb5834b Merge pull request #26706 from thaJeztah/update-systemd-instructions
Cleanup / sync RHEL, CentOS, Fedora installation docs
2016-09-19 22:10:30 +02:00
Sebastiaan van Stijn
b2bb4e11aa
Cleanup / sync RHEL, CentOS, Fedora installation docs
These installation procedures are very similar, so
synchronized these docs and removed some differences.

Also;

- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
  installation, because most people want to have docker
  started automatically (and overlooked this step).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 21:30:57 +02:00
Steven Erenst
e9a9015e38 Fix regex for the json-file logger opts in overview.md
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.

The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.

Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
2016-09-19 10:47:40 -07:00
Sebastiaan van Stijn
9d2d89ce6f Merge pull request #26704 from clbn/patch-1
Fix typos in installation doc for Mac
2016-09-19 18:25:35 +02:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
2016-09-19 17:30:27 +02:00
Alex Olshansky
f7af5cc780 Fix typos in installation doc for Mac
Signed-off-by: Alex Olshansky <i@creagenics.com>
2016-09-19 16:04:46 +02:00
Sebastiaan van Stijn
533b00da8b
Fix Markdown formatting and missing prompt in service create
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 13:57:39 +02:00
Sebastiaan van Stijn
b81d12e7a1
Update sshd example to use ubuntu 16.04
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 12:52:13 +02:00
Misty Stanley-Jones
5880d62953
Misty's edits and additions
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
eb3a01eb43 Add --mount syntax documentation to CLI reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 11:56:59 +02:00
Sebastiaan van Stijn
1ccd79e1a9 Merge pull request #26682 from yuexiao-wang/fix-typo
Fix typo for docs reference
2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
abd02a9ba0 Merge pull request #26691 from YuPengZTE/devSUSE
Add prompt of $
2016-09-19 10:45:23 +02:00
YuPengZTE
638546d120 Add prompt of $
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-19 10:46:25 +08:00
Brian Goff
fcf77620d6 Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
Fix typo in docs. s/methodoligies/methodologies/
2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
1444401b16 Merge pull request #26678 from YuPengZTE/devSUDO
Add bash symbol for sudo
2016-09-18 13:36:13 +02:00
yuexiao-wang
0f0b0db842 fix typo for docs reference
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-18 11:00:19 +08:00
YuPengZTE
ced2729841 The hit is missed
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-18 09:38:20 +08:00
pestophagous
191adcfb63
Fix typo in docs. s/methodoligies/methodologies/
Signed-off-by: K Heller <pestophagous@gmail.com>
2016-09-17 15:37:03 -07:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics
Windows: Add support for docker stats
2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
788a8a3cac Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
Fix service and tasks API documentation
2016-09-17 16:13:15 +02:00
Sebastiaan van Stijn
1fb556bb7e Merge pull request #26654 from thaJeztah/sync-api-docs
Synchronize API docs
2016-09-17 16:11:42 +02:00
Sebastiaan van Stijn
2f5b379192 Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
Move HostConfig.Mounts to correct API version
2016-09-17 13:53:37 +02:00
Sebastiaan van Stijn
d93a62e9be Merge pull request #26266 from YuPengZTE/dev
The etc and dot is seprated
2016-09-17 03:37:00 +02:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc
Fix mtu option in documentation
2016-09-17 03:32:23 +02:00
Sebastiaan van Stijn
0bd281c7cb Merge pull request #26558 from lixiaobing10051267/masterSymbol2
add bash symbol for docker network inspect
2016-09-17 03:26:55 +02:00
Sebastiaan van Stijn
53b1dcb25c
Synchronize API docs
This synchronizes changes between API versions, and:

- applies e0a552504e to
  older versions of the documentation
- applies a2a0a03e2b to
  API version 1.25
- syncs some minor differences

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
cd73ceffd8
Move HostConfig.Mounts to correct API version
This was added in fc7b904dce,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
d69409fd43
Fix service and tasks API documentation
The documentation contained some outdated information
on these endpoints.

This change fixes those parts of the documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-17 02:29:38 +02:00
Josh Bodah
484fbe236d Remove extra paren in run --link docs
Signed-off-by: Josh Bodah <jb3689@yahoo.com>
2016-09-16 15:32:12 -04:00
John Howard
340e5233b2 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-16 11:56:15 -07:00
Vincent Demeester
8a7006ff8e Merge pull request #26620 from runcom/fix-docs
docs: reference: api: clarify pull all tags
2016-09-16 20:56:04 +02:00
Michael Crosby
efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
2016-09-16 10:22:09 -07:00
Vincent Demeester
d05e34ca9b Merge pull request #26637 from thaJeztah/fix-cli-prompt
Use "sudo" for dockerd examples
2016-09-16 17:44:07 +02:00
Sebastiaan van Stijn
87b174080b
Use "sudo" for dockerd examples
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-16 17:22:58 +02:00
Kenfe-Mickaël Laventure
07b5311147 Merge pull request #26618 from AkihiroSuda/fix-apparmor
apparmor: prohibit /sys/firmware/** from being accessed
2016-09-16 07:41:36 -07:00
Antonio Murdaca
03a8b6798d
docs: reference: api: clarify pull all tags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-16 16:35:15 +02:00
Sebastiaan van Stijn
7ca02f86de
Add link to logging drivers reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-16 15:29:28 +02:00
Akihiro Suda
693b4ac67a apparmor: prohibit /sys/firmware/** from being accessed
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-16 02:21:31 +00:00
Sebastiaan van Stijn
dddea689ab
Synchronize push reference with man page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
51a981fd5f Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
Fix a couple of issues in Get Started docs
2016-09-15 16:51:49 +02:00
Sebastiaan van Stijn
edbb8fb86d
Restore missing "format" example
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-15 16:09:24 +02:00
Akihiro Suda
5af5a1be62 add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-15 09:55:29 +00:00
Sven Dowideit
37869b237c Merge pull request #25774 from ddgenome/cmd-entrypoint-table
Update ENTRYPOINT/CMD table to agree with docs
2016-09-15 09:35:13 +10:00
Anusha Ragunathan
e482d4ee71 Merge pull request #26575 from anusha-ragunathan/update_plugin_docs
Update plugin install docs with registry specifics.
2016-09-14 14:43:41 -07:00
Sebastiaan van Stijn
cfa868f098 Merge pull request #26582 from thaJeztah/add-full-image-link
Add direct link to event chart image
2016-09-14 23:24:34 +02:00
Sebastiaan van Stijn
86de72fef2
Add direct link to event chart image
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-14 23:16:32 +02:00
Yong Tang
1cd06fdd1a Fix a couple of issues in Get Started docs
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.

2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-14 13:40:15 -07:00
Anusha Ragunathan
81d5abf334 Update plugin install docs with registry specifics.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
9b8b6aa224
Remove Frugalware installation docs
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-14 18:10:25 +02:00
Sebastiaan van Stijn
9e9ba1e1c1 Merge pull request #26526 from lixiaobing10051267/masterSymble
fix some incorrect symbols before executing command
2016-09-14 17:48:43 +02:00
lixiaobing10051267
7b73b5fd6a fix some incorrect symbols before executing command
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
8ac2000f50 Merge pull request #25540 from estesp/ro-plus-userns
Remove --read-only restriction when user ns enabled
2016-09-14 13:53:58 +02:00
lixiaobing10051267
7c3a26db16 add bash symbol for docker network inspect
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-14 17:36:48 +08:00
Victoria Bialas
c073404af8 fixed on-page links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-09-13 16:20:05 -07:00
Anusha Ragunathan
8aa454dfc8 Merge pull request #26216 from vieux/plugin_manifest
add some plugin manifest reference doc
2016-09-13 14:03:20 -07:00
Brian Goff
fc7b904dce Add new HostConfig field, Mounts.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).

The new API follows exactly the services mount API.

Example usage of `Mounts`:

```
$ curl -XPOST localhost:2375/containers/create -d '{
  "Image": "alpine:latest",
  "HostConfig": {
    "Mounts": [{
      "Type": "Volume",
      "Target": "/foo"
      },{
      "Type": "bind",
      "Source": "/var/run/docker.sock",
      "Target": "/var/run/docker.sock",
      },{
      "Type": "volume",
      "Name": "important_data",
      "Target": "/var/data",
      "ReadOnly": true,
      "VolumeOptions": {
	"DriverConfig": {
	  Name: "awesomeStorage",
	  Options: {"size": "10m"},
	  Labels: {"some":"label"}
	}
      }]
    }
}'
```

There are currently 2 types of mounts:

  - **bind**: Paths on the host that get mounted into the
    container. Paths must exist prior to creating the container.
  - **volume**: Volumes that persist after the
    container is removed.

Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-13 09:55:35 -04:00
Sebastiaan van Stijn
027e7be348 Merge pull request #25817 from sfsmithcha/update_glossary
add swarm mode terms to the glossary
2016-09-13 12:08:32 +02:00
Sebastiaan van Stijn
4d187df277 Merge pull request #25466 from justincormack/deprecate-maintainer
Begin process of deprecating MAINTAINER
2016-09-13 12:07:04 +02:00
Vincent Demeester
0c90f777b7 Merge pull request #26489 from yuexiao-wang/update-exec
update option for docker exec
2016-09-13 11:16:22 +02:00
Justin Cormack
6fafd07282 Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
2016-09-12 23:56:41 +01:00
Riyaz Faizullabhoy
40f823ccd8 Use latest version of notary server in trust sandbox docs
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-09-12 09:42:12 -07:00
Denis Gladkikh
4907cc7793 Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-09-12 09:00:16 -07:00
Brian Goff
e41839e8a1 Merge pull request #26472 from yongtang/09112016-docker-build-step-0
Fix documentation for `Step 0` to `Step 1` in `docker build`
2016-09-12 09:08:35 -04:00
yuexiao-wang
7084aa24c7 update option for docker commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-12 19:10:45 +08:00
yuexiao-wang
1917d3b958 add option and update the description
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-12 16:08:59 +08:00
Sven Dowideit
2cce7bf33a Merge pull request #26306 from deployable/patch-1
Remote API documentation consistancy
2016-09-12 10:52:30 +10:00
Sven Dowideit
ae4582dc28 Merge pull request #26458 from sfsmithcha/fix_vip_diagram
updates swarm overlay network diagram
2016-09-12 10:11:08 +10:00
Yong Tang
256dbe4b75 Fix documentation for Step 0 to Step 1 in docker build
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-11 10:52:40 -07:00
Vincent Demeester
e6f76800f5 Merge pull request #26426 from sfsmithcha/carry_pry_25414
Carry pr 25414
2016-09-10 11:50:28 +02:00