e92b610690
Merge pull request #28727 from cyli/do-not-display-secret-digest
...
Do not display the digest or size of swarm secrets [1.13]
Upstream-commit: 22ba220e864d6d30ce1ed56a5461b96dbade844f
Component: engine
2016-11-22 16:44:06 -08:00
e746d79ff3
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
00fa4cf151
Update docs to reflect no longer displaying secret digest or size.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: fe127b7eae427bde96b7852ac196825e1c9ea359
Component: engine
2016-11-22 18:18:56 -05:00
8236c4e19a
plugins: misc fixes
...
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6547609870b66f9dfb1894a4987c42608f856f3e
Component: engine
2016-11-22 14:32:07 -08:00
b38b87935c
Merge pull request #28726 from jacobtomlinson/docs-pull-concurrent
...
Document pull concurrent options
Upstream-commit: d145b0b93ffa6f828751c31ea9dd41a5a59e4c59
Component: engine
2016-11-22 23:11:27 +01:00
ee5ee81992
Add concurrent uploads/downloads section
...
Document and link to the concurrent uploads/downloads daemon option.
Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk >
Upstream-commit: b303381a4d679cad652c83f6b7d28cccbc06574c
Component: engine
2016-11-22 21:59:10 +00:00
dc5227ef8f
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
2016-11-22 22:47:38 +01:00
2443044132
Merge pull request #28715 from thaJeztah/add-warning-for-windows-plugins
...
add note that windows does not support managed plugins
Upstream-commit: 0cbc187447bbce72ea50f8efc6596bfd23f7ede4
Component: engine
2016-11-22 21:23:13 +01:00
7c254a513d
Fix typo in docs (Copmose)
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2e120556872ee3ecd7f3b5cd4698e4195220c2ff
Component: engine
2016-11-22 19:09:30 +01:00
5d88abf962
add note that windows does not support managed plugins
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f885463b58f0608d9403a8b84d79320ffcce86a1
Component: engine
2016-11-22 16:01:14 +01:00
e5912f7d7e
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
2016-11-22 12:49:38 +00:00
7e2e397a31
Move API reference to new location
...
See: https://github.com/docker/docker.github.io/pull/606
Also:
- Add missing redirects to API reference pages
- Remove v1.25 and 1.26, because they are being replaced with
swagger generated docs.
- Remove all other docs which aren't reference material, because
this can live in docker/docker.github.io
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 993854f58fa4132ff82c2e1ffe291d90b301db5a
Component: engine
2016-11-22 12:47:25 +00:00
d34c5ada47
Merge pull request #28486 from vdemeester/docs-service-templating
...
Add documentation about templating support on…
Upstream-commit: 700f61841049bca424906b74d80e56d6f1c11248
Component: engine
2016-11-22 00:50:45 +01:00
629b1e5dab
Merge pull request #28664 from thaJeztah/update-service-ps-reference
...
Update service ps reference for "--no-trunc"
Upstream-commit: da4a2f16a0c5914f2bee60a8dc18f9b4975c3cf2
Component: engine
2016-11-22 00:48:03 +01:00
a4da4522af
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
Upstream-commit: 99a7289632974e4388ee09fbea2038410e713e0b
Component: engine
2016-11-21 14:03:00 -08:00
46e8997e76
Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc
...
Update deprecation notes about v1 registry
Upstream-commit: 6cc645c938ffbe261e01a4bdafe7aabe9f0899f3
Component: engine
2016-11-21 19:16:38 +01:00
6276c1c7ff
Update deprecation notes about v1 registry
...
Adds section about the hub deprecating the v1 protocol.
Adds note about intent to disable by default and remove support.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c8f826f4077b15af30d8810f62abd517908bb712
Component: engine
2016-11-21 09:39:48 -08:00
8ca29f7629
Update service ps reference for "--no-trunc"
...
The "--no-trunc" option toggles between showing/hiding
digests.
This updates the reference to show this difference.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90993640f0e21a45874a9efc6b6236b589945d6e
Component: engine
2016-11-21 17:39:58 +01:00
1524794f61
Update cli reference for docker {,stack} deploy
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 88cdfc512b0737f6dd9eb5ad207fb68f9acdf51e
Component: engine
2016-11-21 12:36:31 +01:00
46774960e2
Merge pull request #28607 from mstanleyjones/28133_iptables_false
...
Clarify that ipmasq rules are not added when iptables is false
Upstream-commit: 227af35a173c6b1d3b76f8423b8640553621924d
Component: engine
2016-11-20 17:35:31 +01:00
4b5f254c7b
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: db3f06fd976d71a1d335278ecedf026aea6046c0
Component: engine
2016-11-18 14:25:24 -08:00
3cb0023957
Add HostConfig.Tmpfs to docs for container creation remote API
...
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca >
Upstream-commit: 2c38d43eb5276a82f8e076058506468e0d5a2f9f
Component: engine
2016-11-18 15:00:07 -05:00
2efd6e2078
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
43b3edaf9a
Add documentation about templating support on…
...
… services creation/update.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4571ad05dba48eda9d138c4db20bd2a63022ff63
Component: engine
2016-11-18 15:28:01 +01:00
c61cce0a3d
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
2016-11-18 13:02:40 +01:00
af870551d0
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 039aca05c2eae8a06dc16ff97110539feb44d13b
Component: engine
2016-11-18 10:34:02 +02:00
2b9dc0f4a1
Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference
...
Update `images` cli reference with reference filter
Upstream-commit: c6d69ea9e9a913e6036c5e3832083183ce92da23
Component: engine
2016-11-18 01:34:48 +01:00
781fc7e6b4
api/server/httputils: service unavailable for disable swarm
...
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.
We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 1d90d7604881e29b71819af9c092d565513aeeec
Component: engine
2016-11-17 11:43:45 -08:00
49f71532e6
Update images cli reference with reference filter
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a0d7b34d9cb0876f8583a6e15d1b1aaab8d2b9ab
Component: engine
2016-11-17 15:34:17 +01:00
9fe7b62295
Merge pull request #28322 from Microsoft/jjh/api1.26
...
Bump API to v1.26
Upstream-commit: 3f9dc0213583c7e903bebb02733df1e9ec9263b6
Component: engine
2016-11-17 00:01:46 +01:00
397de7b28c
Edits to plugin docs after building authz plugin
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a524c135dce6ce39ccbca68fdd38f5b575ad82f4
Component: engine
2016-11-16 09:53:23 -08:00
7acf8456de
Merge pull request #27631 from allencloud/get-node-brefore-update
...
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
2016-11-16 17:47:31 +01:00
a086b9b802
Update stats cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 947464e2f1a8df9addce4911f4c1264b2c606543
Component: engine
2016-11-16 15:26:29 +01:00
6e80fcc7bb
Merge pull request #28346 from yongtang/11122016-docs-api-version
...
Fix missing versions in example requests of api docs
Upstream-commit: 297f2fd445a751813780a82a254b9aafc6ab6498
Component: engine
2016-11-16 12:15:05 +01:00
a76e66dfce
Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
...
Update docs for `docker info` for most recent changes.
Upstream-commit: cd2d52b5f6746ab83b835390fc6eb1f13dabde48
Component: engine
2016-11-16 12:08:35 +01:00
0d115ba911
allow node update api receive node name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
2016-11-16 10:18:19 +08:00
1da378e381
Revert reference docs for ambient capabilities
...
This feature was reverted for docker 1.13
in c5251f7116e3d9095a7169fc31bd170dff997c2e,
so removing the documentation as well.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d341bb1b6eac3f40eb4cd5798784635e0183809b
Component: engine
2016-11-15 21:59:21 +01:00
ba476fa907
Merge pull request #28419 from yuexiao-wang/remove-stack-tasks
...
Remove inexistent link and add related links
Upstream-commit: 101676a591793755e43d21c1ab061f1fd4c37551
Component: engine
2016-11-15 13:51:46 +01:00
f1966cf855
Merge pull request #26868 from Microsoft/jjh/deprecateemail
...
1.14 deprecation: email from login
Upstream-commit: c716827dc8de961ad2e69b2db2cb32a3749282da
Component: engine
2016-11-15 13:08:05 +01:00
cfe86197f0
Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win
...
Updated daemon documentation to clarify that live-restore is not supp…
Upstream-commit: b6e1f11105e21ed30c5d6a47c31ca348a8282937
Component: engine
2016-11-15 11:06:26 +01:00
3a03fb540c
Updated daemon documentation to clarify that live-restore is not suppoted on windows
...
Review comment implementation
Signed-off-by: bbayani <bhumikabayani@gmail.com >
Upstream-commit: 45bccaeacbc80f28861bd7fe9cb73007b493b11f
Component: engine
2016-11-15 07:07:43 +00:00
775645f6c4
Remove inexistent link and add related links
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 985cc9fb053e82967a4469cd5f278271b914480c
Component: engine
2016-11-15 09:40:44 +08:00
fb65149136
Merge pull request #28292 from lixiaobing10051267/masterDockerSwarm
...
fix the wrong title with docker swarm
Upstream-commit: ccba7911c80583c1a45ea329a8d337dcd4f6f70e
Component: engine
2016-11-15 00:37:07 +01:00
900e9ed78b
Bump API to v1.26
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9182cf1a8dc592c40d25b628a0a3cfa475c8dcea
Component: engine
2016-11-14 14:24:02 -08:00
c932aa3c77
Add docs for plugin push
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d2bb29f87e326034e4329e31f3208d8f610ccef7
Component: engine
2016-11-14 09:10:21 -08:00
27381440fb
Merge pull request #28280 from yuexiao-wang/remove-doc
...
Remove duplicated document
Upstream-commit: 6cf39760418ab2341e00040d7eecc19542aa9337
Component: engine
2016-11-14 17:34:47 +01:00
f67a1e9e2b
Remove duplicated document
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5527202e41dfa48b8635dd6f274acb7f19ee3302
Component: engine
2016-11-14 14:43:00 +08:00
527e874e41
Fix a small typo in docs/deprecated.md
...
A small typo in `docs/deprecated.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 45e5b2552ab1ca685e88e0feeedc92fb817d8567
Component: engine
2016-11-13 20:04:25 -08:00
a107ce5f56
Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
...
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
a1ee221aad
fix typo in node update docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7bbbc8c7f16869dbb43e4e218ac280d5d1c0944a
Component: engine
2016-11-14 00:07:52 +08:00
