7f275315ed
Fix mention of at sign in docs
...
The at sign (`@`) was being referred to in the documentation as an
ampersand (`&`).
Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
2016-02-05 16:47:57 -05:00
4aac8a60b2
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-05 12:29:54 -05:00
c199506b59
Display `internal` flag on `network inspect`
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-02-04 15:28:37 +08:00
98c4f0bbc3
Merge pull request #18966 from mariusGundersen/machine-readable-state
...
Expose the machine readable state of a container when listing containers
2016-02-03 16:41:45 +01:00
1c95b858ac
Fix memory-swap description in older API versions
...
A value of -1 disables the *limit* so enables unlimited swap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-02 14:49:14 +01:00
1ab7d76f30
Correct old virtual size
...
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-02 12:28:33 +00:00
85475f7dea
Merge pull request #19794 from calavera/14358-disable-colors
...
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
2016-02-01 15:37:44 -08:00
cf93b0bce1
Merge pull request #19898 from joelwurtz/patch-1
...
Update docker-php link library from stage1
2016-02-01 23:37:11 +01:00
d95c487213
Merge pull request #19714 from vdemeester/carry-pr-18787
...
Carry #18787 : Update Instructions for Docker Remote API access
2016-02-01 23:26:40 +01:00
9928b244e9
Update docker-php library from stage1
...
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com>
2016-02-01 22:45:34 +01:00
87a450a37f
Allow disabling of colored Docker logs via daemon flag.
...
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-01 16:19:18 -05:00
7d1018545f
change 'host:port' to `host:port`
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
2016-02-01 17:22:16 +08:00
86beb6e27e
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
2016-02-01 01:25:59 +05:30
2ed72a5d93
Expose the machine readable state of a container when listing containers
...
Updated documentation to reflect the new State property in the inspect remote api
Updated API changes for 1.23
Signed-off-by: Marius Gundersen <me@mariusgundersen.net>
2016-01-31 18:40:37 +01:00
d069e8e7b7
Merge pull request #19846 from shin-/remote_api_container_update_doc
...
Update example request for container update in docs.
2016-01-30 08:05:55 -08:00
6b57380173
Merge pull request #19646 from nishanttotla/19277-CustomInfoField
...
Display SystemStatus field in docker info
2016-01-30 11:48:01 +01:00
5f0643b082
Update example request for container update in docs.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-29 18:35:29 -08:00
6c5e8dd4c2
Adding SystemStatus field for /info endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-29 16:26:43 -08:00
d76fba0191
Change container name to id as actual results
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-29 13:54:28 +08:00
adb9fa7362
Merge pull request #19401 from wenchma/18410-default_net_driver
...
docs: document options for default network driver
2016-01-28 08:30:30 +01:00
ebd1f70165
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-28 11:49:07 +08:00
7beccdc609
Merge pull request #19721 from bboreham/doc-ip-failure
...
Improve wording about re-assigning IP addresses
2016-01-27 22:17:06 +01:00
3fd25d98b8
Update Instructions for Docker Remote API access
...
Update the location of cert.pem and key.pem to use within the
~/.docker folder
Resolves : #18778
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2016-01-27 18:49:31 +01:00
caad94d7bb
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-27 17:11:12 +00:00
386392f799
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-26 23:52:14 -08:00
7992b353c0
Merge pull request #19737 from calavera/fix_reload_docs
...
Remove cluster storage advertise from reload.
2016-01-26 17:04:46 -08:00
e310d070f4
Creating Engine specific menu
...
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-26 15:58:53 -08:00
fa163f5619
Remove cluster storage advertise from reload.
...
Because libnetwork won't really send container information to the new
storage anyways.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-26 18:19:30 -05:00
7d7b2044b7
Add note about mount propagation on systemd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-26 16:48:45 -05:00
5b0183e91c
Merge pull request #19683 from calavera/network_config_file
...
Allow network configuration via daemon config file.
2016-01-25 18:59:20 -08:00
58c2488d07
Merge pull request #19568 from cpuguy83/17907_fix_rmv
...
On container rm, don't remove named mountpoints
2016-01-25 18:13:57 -08:00
c539be8833
Allow network configuration via daemon config file.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 18:54:56 -05:00
dd7d1c8a02
On container rm, don't remove named mountpoints
...
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.
Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:51:28 -05:00
42f6e8d40d
Fix remove API order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-24 02:48:47 -08:00
037d159981
Merge pull request #19622 from r4j4h/quick-doc-fix
...
Correcting `overlay` -> `bridge` driver in run.md
2016-01-24 00:42:36 -08:00
ae5fce9fe0
Correcting `overlay` -> `bridge` driver in run.md
...
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.
Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
2016-01-24 01:34:04 -07:00
bf85a49509
Merge pull request #19592 from duglin/Issue15777
...
Add some helper text for magical ADD
2016-01-22 18:27:44 -08:00
4c76c665b7
Fixing missing certs article; consolidating security material
...
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-22 16:44:18 -08:00
34a83f9f2c
Merge pull request #19517 from calavera/validate_config_keys
...
Verify that the configuration keys in the file are valid.
2016-01-22 15:01:29 -05:00
5e80ac0dd1
Make TLSOptions and LogConfig embedded structs.
...
That way the configuration file becomes flag, without extra keys.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-22 13:20:17 -05:00
8d94a85d62
Add some helper text for magical ADD
...
Closes : #15777
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-01-22 10:13:13 -08:00
b0873c2c50
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
2016-01-22 09:27:53 +02:00
ed4038676f
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-21 16:56:12 -05:00
45db4fa70e
Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
...
Carry 19305: Added `dead` to docs for docker ps -f status=...
2016-01-21 13:46:51 -08:00
859262a82a
Added `dead` to docs for docker ps -f status=...
...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.
Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
2016-01-21 16:44:33 -05:00
5e143d5168
Merge pull request #19540 from A33a/A33a-patch-1
...
Fixed typo in "/etc/subUid"
2016-01-21 17:24:29 +01:00
935849f17a
Fixed typo in "/etc/subUid"
...
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru>
2016-01-21 12:46:29 +01:00
603bc69b2c
Fix comment about swap limit of docker update
...
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-21 13:48:53 +08:00
7db58948bf
Merge pull request #19434 from HackToday/fixmntvolume
...
Refine the volume mount example
2016-01-20 20:42:24 -08:00
c2b59b03df
Fix the typo in ps
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-21 04:26:49 +00:00
Tom X. Tobin