centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
21,321 Commits 56 Branches 28 Tags
08fe0a18f8fbb8e6aaa3760e4e6ffd6032731ca2
Commit Graph

227 Commits

Author SHA1 Message Date
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Vincent Demeester
851c94db1b Merge pull request #19317 from mavenugo/epforce 
Forced endpoint cleanup
 2016-01-14 14:21:30 +01:00
Vincent Demeester
ec143968de Merge pull request #19286 from aboch/ipdocs 
Add missing documentation for static IP options
 2016-01-14 11:00:09 +01:00
Madhu Venugopal
b464f1d78c Forced endpoint cleanup 
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-13 21:28:52 -08:00
Alessandro Boch
ee14232647 Add missing documentation for static IP options 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-13 14:53:14 -08:00
Sebastiaan van Stijn
661d75f398 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable 
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
 2016-01-13 13:22:08 -08:00
Tibor Vass
612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization 
Rename authz to authorization for greater clarity
 2016-01-13 14:30:18 -05:00
Tibor Vass
5c630ea7c3 Rename authz to authorization for greater clarity 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-13 14:15:37 -05:00
Shishir Mahajan
e47112d3e8 daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-13 13:57:31 -05:00
Chun Chen
b70954e60a Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-13 11:30:36 -05:00
Antonio Murdaca
a79f96828f Merge pull request #19249 from calavera/carry_17414 
[Carry 17414] Added additional container information to "docker info".
 2016-01-13 10:42:22 +01:00
Sebastiaan van Stijn
c72be040bb Merge pull request #19187 from estesp/lets-do-this 
User namespaces: graduate from experimental
 2016-01-12 09:34:19 -08:00
Phil Estes
cc63db4fd1 Add daemon documentation on user namespaces feature 
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-01-11 20:54:57 -05:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
Kim Eik
e732f4e649 Added additional container information to "docker info". 
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
 2016-01-11 19:14:44 -05:00
Shishir Mahajan
50305d66f5 man page fix: remove -e/--exec-drive=native related description 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-07 14:21:01 -05:00
Alexander Morozov
c1cd45d547 Choose default-cgroup parent by cgroup driver 
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-07 08:56:26 -08:00
Alexander Morozov
2e3186ab06 Add ability to set cgroup parent for all containers 
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-04 15:16:25 -08:00
Sebastiaan van Stijn
db738dd77f Merge pull request #15666 from vdemeester/3519-configurable-escape 
Implement configurable escape key for attach/exec
 2016-01-04 00:49:07 +01:00
Vincent Demeester
15aa2a663b Implement configurable detach key 
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-03 23:03:39 +01:00
Mary Anthony
32b5f71f0d Creating a man page for the configuration file 
Signed-off-by: Mary Anthony <mary@docker.com>

Adding comments. Fixing bit in daemon

Signed-off-by: Mary Anthony <mary@docker.com>

Arrrgggh

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-03 13:23:18 -08:00
Sebastiaan van Stijn
9d6c2196b5 Merge pull request #18387 from wenchma/18385-improve_help_msg 
Improvement for docker subcommand's help messages
 2016-01-03 12:19:53 +01:00
Vincent Demeester
1a5b97c761 Merge pull request #18932 from wenchma/same_name_of_container_image 
Update integration tests when container and image have same name
 2016-01-01 21:40:51 +01:00
Wen Cheng Ma
d7dc439623 Improvement for docker subcommand's help messages 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-01 12:27:28 +08:00
Qiang Huang
c68a483e44 Fix docs for memory-swap 
Fixes: #18894

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-12-30 09:23:35 +08:00
Wen Cheng Ma
9fbb1306e8 Update integration tests when container and image have same name 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-29 11:08:31 +08:00
Qiang Huang
8799c4fc0f Implemet docker update command 
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-12-28 19:19:26 +08:00
Doug Davis
e6115a6c1c remove =false from options that default to false in the docs 
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-12-23 07:11:35 -08:00
Zhang Wei
26dd026bd7 Add filter for network ls to hide predefined net 
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-12-23 13:26:40 +08:00
Sebastiaan van Stijn
312c82677b Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops 
Add support for blkio read/write iops device
 2015-12-21 23:45:18 +01:00
Alexander Morozov
42460b6772 Merge pull request #17692 from vdemeester/images-format 
Add --format support to images command
 2015-12-21 09:57:29 -08:00
Vincent Demeester
34a3c3cacf Add --format support to images command 
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-12-21 17:38:07 +01:00
Boaz Shuster
60b4db7eb1 Change the quiet flag behavior in the build command 
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2015-12-21 16:38:50 +02:00
Ma Shimiao
843084b08b Add support for blkio read/write iops device 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-12-21 09:14:49 +08:00
Antonio Murdaca
aada8d8117 docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-12-19 09:04:29 +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
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
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
e3fbd6922f Merge pull request #18325 from RsrchBoy/topic/newtorks 
newtork -> network (minor spelling correction)
 2015-12-04 14:03:55 +01:00
Ma Shimiao
3f15a055e5 Add support for blkio read/write bps device 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-12-04 09:26:03 +08:00
Phil Estes
4d849619d4 Merge pull request #17481 from vdemeester/17446-network-inspect-format 
Add format flag to network inspect
 2015-12-03 16:16:04 -05:00
Sebastiaan van Stijn
a2120e5ba3 Address review comments. 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-03 16:07:54 +01:00
Ben Firshman
fe3ec3f77f Add docs and man page entry for --volume-driver 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-12-03 16:02:20 +01:00
Sebastiaan van Stijn
ee3e07d359 Merge pull request #18301 from wenchma/doc_update_for_net 
Add NETWORK_NAME_or_ID value for --net= option
 2015-12-02 22:36:01 +01:00
Vincent Demeester
295c27388d Add format flag to network inspect 
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-12-02 22:32:10 +01:00
Arnaud Porterie
8f1f53f735 Merge pull request #16277 from runcom/add-oom-score-adj 
Add OomScoreAdj
 2015-12-02 11:49:51 -08:00