Arnaud Porterie
117a982d2e
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
Jian Zhang
cdc7f26715
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2016-02-19 09:27:03 +08:00
Alessandro Boch
ed364b69df
Invoke ReloadConfiguration on network controller
...
- It reverts fa163f5619 plus a small change
in order to allow passing the global scope datastore
to libnetwork after damon boot.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-18 12:14:14 -08:00
ozlerhakan
910ea8adf6
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com>
2016-02-18 21:52:15 +02:00
David Calavera
2e6c841b82
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
2016-02-18 10:35:04 -08:00
David Calavera
c795d0bab9
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
2016-02-16 15:01:17 -08:00
Bastiaan Bakker
f982f08c50
add missing trailing slash in ADD and COPY /absoluteDir examples. According to the specs they are mandatory.
...
Signed-off-by: Bastiaan Bakker <bbakker@xebia.com>
2016-02-16 22:52:16 +01:00
Cedric Davies
3fe60bbf95
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com>
2016-02-16 13:24:49 -08:00
David Calavera
80187df257
Merge pull request #19986 from vishh/expose-root-dir
...
Expose docker's root directory by default as part of `docker info`.
2016-02-16 12:57:57 -08:00
Vishnu kannan
6a3176d4fe
Expose docker's root directory by default as part of `docker info`.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-16 10:40:15 -08:00
Robert Wallis
8779a4ca62
Fixing mismatched network name.
...
Using `my-net` to be consistent with:
https://docs.docker.com/engine/reference/run/
Signed-off-by: Robert Wallis <smilingrob@gmail.com>
2016-02-15 13:17:05 -08:00
Roland Huß
c80b36c938
Extended explanation of NetworkMode's value
...
* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name
Signed-off-by: Roland Huß <roland@jolokia.org>
2016-02-13 10:00:51 +01:00
Aidan Hobson Sayers
d736a9d2c3
Add docs for --ipv6 option, also add --internal as appropriate
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-02-12 01:42:15 +00:00
Victor Vieux
99a396902f
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:49:36 -08:00
Jessica Frazelle
1e92e5fdaa
update cap-add docs for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-11 13:47:08 -08:00
Sebastiaan van Stijn
d4d0b8a42b
Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details
...
Improve usage details on overriding USER command in Docker run refere…
2016-02-11 18:18:26 +01:00
Tianon Gravi
b1e5c773b2
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-02-11 08:20:28 -08:00
Sian Lerk Lau
bc3e02b9ec
Improve usage details on overriding USER command in Docker run reference page
...
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
2016-02-12 00:05:32 +08:00
Anonmily
2c60a9cba2
Docker Remote API documentation update
...
I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired.
Signed-off-by: Michelle Liu <michelle@michelleliu.io>
2016-02-11 16:28:15 +01:00
Sebastiaan van Stijn
89f94ec03b
Merge pull request #20161 from tkopczynski/docs-before-since-filters
...
docker ps before and since filters documentation
2016-02-11 15:32:50 +01:00
Tomasz Kopczynski
27fc78abdd
Before and since filters documentation
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-02-09 20:37:33 +01:00
Doug Davis
d579490b2b
Make it clear that env vars must be simple
...
Closes #20169
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-02-08 18:02:37 -08:00
Aditi Rajagopal
47dbb59e5b
Update List of Client Library Projects
...
Resolves : #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2016-02-08 16:16:42 -06:00
Brian Goff
a70d9957c3
Merge pull request #20049 from kesarion/patch-1
...
added dockerizer library
2016-02-05 20:52:07 -05:00
Alexandru Sfirlogea
1cceb854a7
added dockerizer library
...
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com>
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com>
2016-02-05 23:49:36 +02:00
Tom X. Tobin
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
David Calavera
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
Chun Chen
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Kai Qiang Wu(Kennan)
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
David Calavera
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
Sebastiaan van Stijn
cf93b0bce1
Merge pull request #19898 from joelwurtz/patch-1
...
Update docker-php link library from stage1
2016-02-01 23:37:11 +01:00
Sebastiaan van Stijn
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
Joel Wurtz
9928b244e9
Update docker-php library from stage1
...
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com>
2016-02-01 22:45:34 +01:00
Vincent Woo
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
qg
7d1018545f
change 'host:port' to `host:port`
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
2016-02-01 17:22:16 +08:00
Prayag Verma
86beb6e27e
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
2016-02-01 01:25:59 +05:30
Marius Gundersen
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
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
Aditi Rajagopal
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
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
Jessica Frazelle
61553fc2f5
WIP: Update security docs for seccomp/apparmor
...
Signed-off-by: Mary Anthony <mary@docker.com>
Updaing and slight re-arrangement of security information
Signed-off-by: Mary Anthony <mary@docker.com>
Updating security files
Signed-off-by: Mary Anthony <mary@docker.com>
Updating links to the security documentation
Signed-off-by: Mary Anthony <mary@docker.com>
removing some extra spaces
Signed-off-by: Mary Anthony <mary@docker.com>
Correcting spelling
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-14 13:58:37 -08:00
David Calavera
677a6b3506
Allow to set daemon and server configurations in a file.
...
Read configuration after flags making this the priority:
1- Apply configuration from file.
2- Apply configuration from flags.
Reload configuration when a signal is received, USR2 in Linux:
- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 16:44:37 -05:00
Tibor Vass
e35f5a481a
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
2016-01-14 16:30:03 -05:00
Ryan Belgrave
662cac08ef
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-14 14:32:25 -05:00
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
Vincent Demeester
63525a6dc5
Merge pull request #19252 from HackToday/fix-vol-resp-doc
...
Update response content for volume mounts
2016-01-14 09:15:13 +01:00