centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 07:18:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
21,842 Commits 54 Branches 28 Tags
9afdd436cdb0d13eff8f34026a7f7e4d40cfda53
Commit Graph

584 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
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
Vincent Demeester
6b57380173 Merge pull request #19646 from nishanttotla/19277-CustomInfoField 
Display SystemStatus field in docker info
 2016-01-30 11:48:01 +01:00
Joffrey F
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
Nishant Totla
6c5e8dd4c2 Adding SystemStatus field for /info endpoint 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-01-29 16:26:43 -08:00
Wen Cheng Ma
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
Vincent Demeester
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
Wen Cheng Ma
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
Vincent Demeester
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
Bryan Boreham
caad94d7bb Improve wording about re-assigning IP addresses 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2016-01-27 17:11:12 +00:00
Sebastiaan van Stijn
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
Tibor Vass
7992b353c0 Merge pull request #19737 from calavera/fix_reload_docs 
Remove cluster storage advertise from reload.
 2016-01-26 17:04:46 -08:00
Mary Anthony
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
David Calavera
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
Brian Goff
7d7b2044b7 Add note about mount propagation on systemd 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-26 16:48:45 -05:00
Sebastiaan van Stijn
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
Tibor Vass
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
David Calavera
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
Brian Goff
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
Sebastiaan van Stijn
42f6e8d40d Fix remove API order in menu 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-24 02:48:47 -08:00
Sebastiaan van Stijn
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
Jasmine Hegman
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
Sebastiaan van Stijn
bf85a49509 Merge pull request #19592 from duglin/Issue15777 
Add some helper text for magical ADD
 2016-01-22 18:27:44 -08:00
Mary Anthony
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
Phil Estes
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
David Calavera
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
Doug Davis
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
Anton Polonskiy
b0873c2c50 fixed typo 
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
 2016-01-22 09:27:53 +02:00
David Calavera
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
Sebastiaan van Stijn
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
Kareem Khazem
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
Vincent Demeester
5e143d5168 Merge pull request #19540 from A33a/A33a-patch-1 
Fixed typo in "/etc/subUid"
 2016-01-21 17:24:29 +01:00
Azat Khuyiyakhmetov
935849f17a Fixed typo in "/etc/subUid" 
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru>
 2016-01-21 12:46:29 +01:00
Qiang Huang
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
Sebastiaan van Stijn
7db58948bf Merge pull request #19434 from HackToday/fixmntvolume 
Refine the volume mount example
 2016-01-20 20:42:24 -08:00
Kai Qiang Wu(Kennan)
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
David Calavera
7915077a38 Merge pull request #19485 from HackToday/fixlink 
Fix the ulimit link
 2016-01-20 14:53:38 -08:00
Kai Qiang Wu(Kennan)
3c8042a0cb Fix commit wrong repository example 
The old name is invalid in new repository name spec.
So we need to fix them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 10:25:41 +00:00
Kai Qiang Wu(Kennan)
8f3c0fdff3 Fix the ulimit link 
The old link not existed, we need fix it the right one.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 09:18:20 +00:00
Kai Qiang Wu(Kennan)
9e3c1f2609 Refine the volume mount example 
The path here should be absolute, else it would
deem it as volume name.

Also link to release page to contain static binary,
the old link not work, because it is just used to
install docker in os distro, it can not be used
as static binary directly.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 06:40:46 +00:00
Vincent Demeester
05e36d254f Merge pull request #19437 from HackToday/fixulimit 
Fix ulimit command form
 2016-01-19 10:26:02 +01:00
Vincent Demeester
25f4f71512 Merge pull request #19436 from HackToday/fixhostdev 
Fix add host device example
 2016-01-19 10:25:08 +01:00
Kai Qiang Wu(Kennan)
98e5a8efcc Fix ulimit command form 
The ulimit is builtin, so we need shell form to execute it.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 07:44:58 +00:00
Kai Qiang Wu(Kennan)
62b525f75d Fix add host device example 
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 07:00:58 +00:00
Kai Qiang Wu(Kennan)
3cc5550003 Fix the privileged example 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 06:41:49 +00:00
Tibor Vass
a0fab35fe8 Bump API Version to v1.23 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-15 10:44:02 -05:00
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-15 10:03:29 +08:00
Sebastiaan van Stijn
e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
 2016-01-14 16:44:58 -08:00
Sebastiaan van Stijn
9539c0a402 Merge pull request #18452 from moxiegirl/carrry-doc-17989 
Update security docs for seccomp/apparmor
 2016-01-14 14:42:37 -08:00
Arnaud Porterie
33a06a7f05 Merge pull request #19346 from albers/completion-detach-keys 
Completion and docs update for --detach-keys
 2016-01-14 14:40:44 -08:00
Harald Albers
3bf821054e Document that detach keys are a list of key bindings 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 13:58:41 -08:00