5aea778205
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
Upstream-commit: c795d0bab9057fbf16ca70349bcc37e244be33b9
Component: engine
2016-02-16 15:01:17 -08:00
6396772da2
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 >
Upstream-commit: f982f08c5097e25b901152289faf960d557c130e
Component: engine
2016-02-16 22:52:16 +01:00
442a84b35d
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com >
Upstream-commit: 3fe60bbf95b60f1a1e847a48e1c9b9730e570dff
Component: engine
2016-02-16 13:24:49 -08:00
ddc0af4e6a
Merge pull request #19986 from vishh/expose-root-dir
...
Expose docker's root directory by default as part of `docker info`.
Upstream-commit: 80187df25708782db20846e63aef7ddb0419c7cf
Component: engine
2016-02-16 12:57:57 -08:00
9315309e4c
Expose docker's root directory by default as part of docker info.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com >
Upstream-commit: 6a3176d4fee3e747ecb6b2d27ab2eb68471f3f8f
Component: engine
2016-02-16 10:40:15 -08:00
1edac85cca
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 >
Upstream-commit: 8779a4ca62db8b64c5016be20456d5b2e5a407e9
Component: engine
2016-02-15 13:17:05 -08:00
d4a856da9f
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 >
Upstream-commit: c80b36c938306ef9cc9ad6865cfc251a694f59aa
Component: engine
2016-02-13 10:00:51 +01:00
697a990701
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
ea8becc33f
update cap-add docs for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1e92e5fdaab833000d6d3a4f6756cb677cb7899e
Component: engine
2016-02-11 13:47:08 -08:00
2d3744313f
Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details
...
Improve usage details on overriding USER command in Docker run refere…
Upstream-commit: d4d0b8a42bcf5e5e1df3565101277dc10843735a
Component: engine
2016-02-11 18:18:26 +01:00
784a3213bb
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b1e5c773b28d27a67d20c0aa0182d40005cfdb50
Component: engine
2016-02-11 08:20:28 -08:00
d0366b3eb4
Improve usage details on overriding USER command in Docker run reference page
...
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com >
Upstream-commit: bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202
Component: engine
2016-02-12 00:05:32 +08:00
1d794c30ed
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 >
Upstream-commit: 2c60a9cba2e0920c9f1e8a193dcf0b6ddad71c5a
Component: engine
2016-02-11 16:28:15 +01:00
704fe83e00
Merge pull request #20161 from tkopczynski/docs-before-since-filters
...
docker ps before and since filters documentation
Upstream-commit: 89f94ec03b73cb26963215b81e231f3cc433a38c
Component: engine
2016-02-11 15:32:50 +01:00
e2150f69d4
Before and since filters documentation
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 27fc78abdd2a603479eceded12964356ba971310
Component: engine
2016-02-09 20:37:33 +01:00
6675019158
Make it clear that env vars must be simple
...
Closes #20169
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d579490b2bd2396c74a48c5c6f41ffc94cd4febd
Component: engine
2016-02-08 18:02:37 -08:00
87068955df
Update List of Client Library Projects
...
Resolves : #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 47dbb59e5b5d3472f9391e965131015d83d614a4
Component: engine
2016-02-08 16:16:42 -06:00
feece77ee7
Merge pull request #20049 from kesarion/patch-1
...
added dockerizer library
Upstream-commit: a70d9957c360bf137d20ff4e65b84465362e0686
Component: engine
2016-02-05 20:52:07 -05:00
05c81423d8
added dockerizer library
...
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com >
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com >
Upstream-commit: 1cceb854a7526eeb5b91be72cedf571af01bc009
Component: engine
2016-02-05 23:49:36 +02:00
2c81aeb705
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 >
Upstream-commit: 7f275315edc73027b3d144da439b00fa6565baec
Component: engine
2016-02-05 16:47:57 -05:00
178f5e51dc
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4aac8a60b2c969639a96a1c245a18e457d5db4dd
Component: engine
2016-02-05 12:29:54 -05:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
71738b2706
Merge pull request #18966 from mariusGundersen/machine-readable-state
...
Expose the machine readable state of a container when listing containers
Upstream-commit: 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc
Component: engine
2016-02-03 16:41:45 +01:00
ec3cd49e30
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 >
Upstream-commit: 1c95b858ac040974d2be73bb31d0d59af9b0b960
Component: engine
2016-02-02 14:49:14 +01:00
642e9a30eb
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 >
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
2016-02-02 12:28:33 +00:00
252a3f9cb5
Merge pull request #19794 from calavera/14358-disable-colors
...
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
Upstream-commit: 85475f7deabed7d94e98321bdb190f7eb756eaec
Component: engine
2016-02-01 15:37:44 -08:00
6118a0b79d
Merge pull request #19898 from joelwurtz/patch-1
...
Update docker-php link library from stage1
Upstream-commit: cf93b0bce1b24d30c9a1480ddb15a1f83f2b5fd4
Component: engine
2016-02-01 23:37:11 +01:00
6dc1df39d7
Merge pull request #19714 from vdemeester/carry-pr-18787
...
Carry #18787 : Update Instructions for Docker Remote API access
Upstream-commit: d95c4872135b0926e7911bf2b0b699e347c41e82
Component: engine
2016-02-01 23:26:40 +01:00
ba3948fd3c
Update docker-php library from stage1
...
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com >
Upstream-commit: 9928b244e9c1eb32eb63fc7a9666a946ca8729d6
Component: engine
2016-02-01 22:45:34 +01:00
fb14e6604b
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 >
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
2016-02-01 16:19:18 -05:00
af0e1e3cc9
change 'host:port' to host:port
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com >
Upstream-commit: 7d1018545f5c38c936ed893145e70f84b8f50976
Component: engine
2016-02-01 17:22:16 +08:00
7637bcdb16
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com >
Upstream-commit: 86beb6e27e9954e50828993ef0fb44486d2318ab
Component: engine
2016-02-01 01:25:59 +05:30
a680f04e2d
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 >
Upstream-commit: 2ed72a5d9368cab3bf9e3dadde95b3d4d50048d1
Component: engine
2016-01-31 18:40:37 +01:00
18160b41cf
Merge pull request #19846 from shin-/remote_api_container_update_doc
...
Update example request for container update in docs.
Upstream-commit: d069e8e7b7733fbde5889d3afd97cac21ff474b3
Component: engine
2016-01-30 08:05:55 -08:00
8c7b621b27
Merge pull request #19646 from nishanttotla/19277-CustomInfoField
...
Display SystemStatus field in docker info
Upstream-commit: 6b573801730f7655a1e2ef1edc35df8e32b713f7
Component: engine
2016-01-30 11:48:01 +01:00
6d05098f7a
Update example request for container update in docs.
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 5f0643b082d4fe5a7be9fa0a00088e3e37882824
Component: engine
2016-01-29 18:35:29 -08:00
9aabd7572f
Adding SystemStatus field for /info endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a
Component: engine
2016-01-29 16:26:43 -08:00
e4d391225e
Change container name to id as actual results
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: d76fba0191fc64759febc1ee22c6bc28ff49b3d6
Component: engine
2016-01-29 13:54:28 +08:00
45d01482b0
Merge pull request #19401 from wenchma/18410-default_net_driver
...
docs: document options for default network driver
Upstream-commit: adb9fa736283bd0c57edccd44819207c63f8be98
Component: engine
2016-01-28 08:30:30 +01:00
9cc23f26d7
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
24f696e76e
Merge pull request #19721 from bboreham/doc-ip-failure
...
Improve wording about re-assigning IP addresses
Upstream-commit: 7beccdc609667e6ec7517494779bbb2ef61102af
Component: engine
2016-01-27 22:17:06 +01:00
326b3eb110
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 >
Upstream-commit: 3fd25d98b818c5e381571c9ba6ee7d00984f6bc7
Component: engine
2016-01-27 18:49:31 +01:00
5cfcf48d8a
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: caad94d7bb12f07976141b4e7bc04f94f0380961
Component: engine
2016-01-27 17:11:12 +00:00
3bba97b9dd
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
2016-01-26 23:52:14 -08:00
a374e9a1d6
Merge pull request #19737 from calavera/fix_reload_docs
...
Remove cluster storage advertise from reload.
Upstream-commit: 7992b353c04b4214c28d5be6195b2703a52defb1
Component: engine
2016-01-26 17:04:46 -08:00
e734434f58
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 >
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
2a5a8c6749
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 >
Upstream-commit: fa163f5619bb01cabca1c214b59e14518a797a7a
Component: engine
2016-01-26 18:19:30 -05:00
08577a13fd
Add note about mount propagation on systemd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7d7b2044b76a7f3a332f3c9bdb17dd8b4e66ee22
Component: engine
2016-01-26 16:48:45 -05:00
531573357d
Merge pull request #19683 from calavera/network_config_file
...
Allow network configuration via daemon config file.
Upstream-commit: 5b0183e91c173c06bcbb5d53da03f13519c14c87
Component: engine
2016-01-25 18:59:20 -08:00
360e6f6c70
Merge pull request #19568 from cpuguy83/17907_fix_rmv
...
On container rm, don't remove named mountpoints
Upstream-commit: 58c2488d07f4c984c853ca4b4a5c86b55c4c784c
Component: engine
2016-01-25 18:13:57 -08:00
