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
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
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
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
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
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
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
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
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
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
983c12d757
Update docs for docker info for most recent changes.
...
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d7257640835abe5e7c08235b3fd974e319dbd7b6
Component: engine
2016-11-12 17:30:53 -08:00
37bec9cc07
cli: Add valid suffixes for remaining duration options
...
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 32b12a28fcab98b79c9176fb78b5620a46906916
Component: engine
2016-11-11 17:44:42 -08:00
28edc30e67
Merge pull request #28278 from yuexiao-wang/stack-deploy
...
Add --with-registry-auth for stack deploy
Upstream-commit: e68003142f641729d62264dce2a1e1b2c63916d7
Component: engine
2016-11-10 21:28:40 -08:00
8256e8f1b5
Add --with-registry-auth for stack deploy
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8e04bc5572dc5790868d8c40c62c17ccae043031
Component: engine
2016-11-11 11:01:31 +08:00
d159a5119b
Merge pull request #28231 from yuexiao-wang/container-exec
...
Remove redundant parameter and fix typos
Upstream-commit: 891e03eb7dc3b3e5a22efa21f76a5ae1e35cc03b
Component: engine
2016-11-11 09:55:42 +08:00
3baa399d95
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
3213314d62
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
2016-11-10 16:55:29 -08:00
fadae43674
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
0d1faa11e0
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
510a237f2b
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
Upstream-commit: 0151fb7618ee7cd0bb7de213c604257cf5e3dc92
Component: engine
2016-11-10 13:59:46 -08:00
fad8660a66
Merge pull request #28192 from allencloud/fix-docs-issue-on-service-ls-api
...
change node ls and service ls api and docs
Upstream-commit: a81385b0cb7045dfdc7302ed4144a0243e464d0b
Component: engine
2016-11-10 13:46:35 -08:00
9de0bed2e4
service logs reference documentation
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 97e4bff6b2035f24306f41ef83eb4d79e53d354b
Component: engine
2016-11-10 13:46:03 -08:00
6f1d87061d
Merge pull request #28043 from vieux/plugin_set_gogogo_continue
...
support mounts,devices and args for docker plugin set
Upstream-commit: fa7c1a68a68ffb7c6851c59d2c0b41091b9d6e5e
Component: engine
2016-11-10 13:24:02 -08:00
9ee3779eb4
cli: Change autolock flag description
...
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 41b84e0994f9ec72990b7f0fc758f602f6241bc6
Component: engine
2016-11-10 12:05:19 -08:00
1bc2b60fd4
update swagger and docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: aef1dec9a6dbf1dcf4b43417c3c5fafda2ede957
Component: engine
2016-11-10 11:58:15 -08:00
fb791c891a
Add zsh completion for new prune commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 712445607d5c5e03ea39bd9c6403104565a0d342
Component: engine
2016-11-10 20:51:44 +01:00
e312e280e3
change node ls and service ls api and docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 48c3fcedfa95f7c12868b218bd831dac8e04864f
Component: engine
2016-11-11 02:51:19 +08:00
6e2afbaf59
Add flag --host to service create and --host-add/--host-rm to service update
...
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.
This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.
Related docs has been updated.
An integration test has been added.
This fix fixes 27902.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ea9a23ccdbd3a861e4cfa3441482b448fd1c17a5
Component: engine
2016-11-10 10:20:24 -08:00
7b76246b62
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
Upstream-commit: 89cc35447d96f6dbd5503d76883c33742076ca10
Component: engine
2016-11-10 09:47:15 -08:00
8bb2169ed5
Merge pull request #28186 from yongtang/27567-follow-up-dns-options
...
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: 33af4dd505aac709d607d26fc19a16d3dffdd66e
Component: engine
2016-11-10 16:20:17 +01:00
6949dd3368
rename plugin manifest
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 49ca91fbebbea80587ce3c0814bba3b41cce14a0
Component: engine
2016-11-10 00:09:23 -08:00
3376796c8e
update network ls docs to add SCOPE
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 9410f4cc869a3f5f569d32741d1622f2d38a5207
Component: engine
2016-11-10 12:18:08 +08:00
f3074c32a8
Remove redundant parameter and fix typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 713cae7ca2b8a5fa36e25f3fb30531f6400fafc3
Component: engine
2016-11-10 11:05:31 +08:00
0f8fed3268
Merge pull request #28150 from AkihiroSuda/mounttmpcli
...
opts/mount: add tmpfs-specific options
Upstream-commit: 55543c45a20b38262b966548b05738260d67b065
Component: engine
2016-11-09 17:50:04 -08:00
62ec0be101
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
2016-11-09 17:49:51 -08:00
c4b7cbe0fb
Document autolock/unlock/unlock-key
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 824db2c4543f912c1fdf392ebbaefa5540bc88a4
Component: engine
2016-11-09 16:12:11 -08:00
3e9922773f
Merge pull request #28078 from sanimej/inspect
...
Show peer nodes in network inspect for swarm overlay networks
Upstream-commit: 5ef5a4216a83421122461c90b7aa1ca1d709c4c8
Component: engine
2016-11-09 15:33:13 -08:00
948055475e
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
2016-11-09 15:23:03 -08:00
6c7506b25f
Show peer nodes in network inspect for swarm overlay networks
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: dd9944aa644c717009a85ab85e00894ef3d3b20f
Component: engine
2016-11-09 13:58:04 -08:00
a8a11f6c62
Add --dns-option to docker run and hide --dns-opt
...
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055
In #27567 , `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.
This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.
This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.
This fix also updates the docs and bash/zsh completion scripts.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9b6b3c2076911ea0a510548943180ac9d1b8c286
Component: engine
2016-11-09 12:13:25 -08:00
19e0a8c065
support labels for secrets upon creation; review updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 583c013a8735031f4e5090bb1699effb64daf950
Component: engine
2016-11-09 14:27:45 -05:00
