6d8620acc6
Merge pull request #16604 from mountkin/add-missing-commit-parameters
...
add missing parameters of the commit API to the docs
Upstream-commit: dbc20693f7bc6ce9bc1da3f6c4c0cd725e0454c1
Component: engine
2015-10-09 20:55:54 +02:00
1863ad7ae9
Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
...
man update for docker run with host volumes
Upstream-commit: 26ee5fea02c7e7d09addc13275a0a44d2f608a4c
Component: engine
2015-10-09 09:24:11 -07:00
7318a696ed
add missing parameters of the commit API to the docs
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: b69f4f3c1366385468e140613aedfc41038a4b35
Component: engine
2015-10-09 23:21:12 +08:00
629317774a
Merge pull request #16108 from charleswhchan/patch-2
...
Touch up Node.js and MongoDB examples
Upstream-commit: 3526993b2f2a490f29f291677d765face43a7bc7
Component: engine
2015-10-09 15:33:30 +02:00
ccb8fd3e79
Merge pull request #16876 from luca3m/patch-1
...
Sync with remote API
Upstream-commit: 06146b333cb18dd3997e9c3632d79771ba79145c
Component: engine
2015-10-09 06:30:02 -07:00
c902cdd516
Merge pull request #16833 from sunyuan3/cpu-shares
...
Add description for "--cpu-shares=0".
Upstream-commit: 734c9d2f67ada2dcc26a5a9b23f9fd5de0421c1f
Component: engine
2015-10-09 06:29:18 -07:00
0de3aef69d
Merge pull request #15903 from charleswhchan/patch-1
...
Revise documentation for Docker LABEL.
Upstream-commit: b7083cf08bc37e52cf7c49ce4f7d42f30576dbd0
Component: engine
2015-10-09 06:11:50 -07:00
2a3da85fc7
Sync with remote API
...
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Sync also container events
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Sync also man page
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Upstream-commit: d7ca0a48ac827c394f406787d1b28301da3c9a13
Component: engine
2015-10-09 13:53:51 +02:00
774ab0f6af
Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903 .
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c7e0531c3ab1844423e64ef49619faa24471f2e3
Component: engine
2015-10-08 20:47:09 -07:00
f8f0e2ad59
Merge pull request #16861 from moxiegirl/fix-testing-stuff
...
Removing the tests.
Upstream-commit: bccf5c756b1aa80832ff6ca54ff539b71ab73faa
Component: engine
2015-10-09 00:46:02 +02:00
f583b724cf
Removing the tests. We have training site now.
...
Ugh...actually adding the files to delete
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5a94d2b5b9dc0d09d8113396f26d1757142c0661
Component: engine
2015-10-08 15:22:59 -07:00
2c93131473
Merge pull request #16644 from dhiltgen/discovery_tls
...
Add TLS support for discovery backend
Upstream-commit: b50a88cfd78498e5cd943ee3964585a73067e3e4
Component: engine
2015-10-08 14:21:06 -07:00
b07ff86773
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
Upstream-commit: 246072e8c5184c78edc9f40435987a7ba26baaa8
Component: engine
2015-10-08 12:27:49 -07:00
30a049bac1
Merge pull request #16850 from moxiegirl/fix-command-meta
...
Fixing issues introduced with new commands adding index
Upstream-commit: 80469f8180506b8e3a04e63766b15caddffa9726
Component: engine
2015-10-08 20:59:59 +02:00
336ef562f3
Merge pull request #16791 from flaccid/patch-1
...
Do not run yaourt as root/sudo
Upstream-commit: 73e3d85c28e4fefb035d73ea0e57c6502409b01a
Component: engine
2015-10-08 11:50:56 -07:00
92bcbdcb5f
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
2015-10-08 09:28:46 -07:00
85e1a44e76
Merge pull request #16832 from sunyuan3/daemoncommand
...
Replace the deprecated -d with docker daemon.
Upstream-commit: 52de25049609d55aff26b91db12a792ace30f275
Component: engine
2015-10-08 10:06:10 -04:00
6ff15cb8df
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
282a5880a8
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
1e33aad6ac
docs: minor fix in faq, and update link
...
The registry doesn't have containers, only images.
Also updated the Docker Hub link to the new location.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6fda30a43753d504faa8a3d06ef886796e954b81
Component: engine
2015-10-08 13:49:30 +02:00
0012e76955
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
7fe62e2968
Add description for "--cpu-shares=0".
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b7249569e27e1962c69eef2b8f547fb6fb7ad367
Component: engine
2015-10-08 10:50:55 +08:00
ee5def44d4
Replace the deprecated -d with docker daemon.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b08c6b17685d4af40e9705ca0efddbdffdf2657e
Component: engine
2015-10-08 10:25:16 +08:00
47fa2052c1
Add TLS support for discovery backend
...
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS. Example usage:
docker daemon [other args] \
--cluster-advertise 192.168.122.168:2376 \
--cluster-store etcd://192.168.122.168:2379 \
--cluster-store-opt kv.cacertfile=/path/to/ca.pem \
--cluster-store-opt kv.certfile=/path/to/cert.pem \
--cluster-store-opt kv.keyfile=/path/to/key.pem
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 124792a8714425283226c599ee69cbeac2e4d650
Component: engine
2015-10-07 16:01:00 -07:00
9c388a6249
Docs: Add docker-elements to remote API client lib doc page
...
This closes #16824
Signed-off-by: Januar Wayong <januar@gmail.com >
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
2015-10-08 08:45:35 +11:00
5e87c46dcd
clarify dockerignore semantics
...
Signed-off-by: Grant Reaber <grant.reaber@gmail.com >
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
2015-10-07 15:51:57 -05:00
780fae5a2c
Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
...
Don't put dockerfiles in one continuous code block
Upstream-commit: 4c1540c8d2bb57123a4faa769d78cdf6202d4314
Component: engine
2015-10-07 13:40:19 -07:00
6b3f6691b5
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
80c6a28fe2
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
3ba7e5f650
change flag name to better follow the other flags that start with disable;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
af07841b68
Networking API and UX documentation
...
More doc updates will follow
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
917e7739ac
Mention more realistic examples are available
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 4cb0790a620924a9fe5d751c6c7e6b37183697df
Component: engine
2015-10-07 11:45:57 +01:00
000787bb0d
Don't put dockerfiles in one continuous code block
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 6a1a192e072cc44d80230626071efe756d77d373
Component: engine
2015-10-06 22:58:42 +01:00
cd659bcc9c
devmapper: Provide option to enabled deferred device deletion
...
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.
Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 51e059e7e90f37848596a0b6ec83f7835e6e4131
Component: engine
2015-10-06 17:37:21 -04:00
6f6de99953
Do not run yaourt as root/sudo
...
Signed-off-by: Chris Fordham <chris@fordham-nagy.id.au >
Upstream-commit: e9c64b6d99f23ca2ad6a755952fd9d5bcf63e19c
Component: engine
2015-10-06 17:59:52 +11:00
a2758a7a50
Merge pull request #16647 from vdemeester/revert-env-validation-docs
...
Update documentation on the revert on env validation
Upstream-commit: e1d3cb89f16c90a3ec6777e34c769cc2a35d123e
Component: engine
2015-10-05 15:27:45 -07:00
b9a953d801
Merge pull request #16747 from vdemeester/docs-testdirs
...
Update test-and-docs with TESTDIRS
Upstream-commit: 0339ed787c4e7795ad8b3f6d3a230ba8dcec4d48
Component: engine
2015-10-05 10:39:56 -07:00
165ebff00d
Merge pull request #16662 from moxiegirl/install-via-rpm
...
Updating the installations with rpm and yum install
Upstream-commit: ec1d8d7f2a8f563deb61df2b35aa8a9d6a07c3e2
Component: engine
2015-10-05 09:46:53 -07:00
c1ad8272d0
Update documentation on the revert on env validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b3fe785c7267bff533c9b2fc324c58e37796e973
Component: engine
2015-10-04 23:04:36 +02:00
72f4bc7137
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
b51b5af287
Fix man and commandline docs
...
- missing help option in `docs/reference/commandline/*.md` (some files
have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com >
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
3e4d4e0287
Update test-and-docs with TESTDIRS
...
… and fix the rendering of `make test-unit` with TESTDIRS :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0542939f405ce6c5cad42bd715d7ceefd573db75
Component: engine
2015-10-04 21:19:04 +02:00
1aa805ef60
Updating the installations with rpm and yum install
...
Prefer rpm/yum over script install
Updating with review comments
Adding second round review comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5e061b5945df047c68953aa424fafbc5a2706ab5
Component: engine
2015-10-04 11:29:58 -07:00
883f553c16
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c1713e7c5a8f2eee7d78b17eef81b0d4203aabdd
Component: engine
2015-10-02 16:45:08 -04:00
a9fcaeb043
Make exec start return proper error codes
...
Exec start was sending HTTP 500 for every error.
Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.
Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
f5fe88af39
Merge pull request #16680 from dnephin/update_list_image_api_docs
...
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
6f5edad812
Fix docker ps truncate long image name by default
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00
568946688a
Merge pull request #16385 from RichardScothern/v1-deprecation
...
Add a daemon flag to prevent contact with v1 registries.
Upstream-commit: 85244f80e324428cef3dc526d1c831ed20eac6c2
Component: engine
2015-09-30 10:10:06 -07:00
85d177c805
Fix api documenation for /images/json response format
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e5967d041d8cb57cc4ddeee6783580d9be3415f2
Component: engine
2015-09-30 12:24:34 -04:00
f40e350889
Command line, manpage and deprecation documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: 4acf29a80813c8f14174390fbaf5cb74c4a7fadc
Component: engine
2015-09-28 10:31:04 -07:00
