Commit Graph

6803 Commits

Author SHA1 Message Date
1623433ab1 Add support for update order
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.

This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
e25f6c5a1b Added start period option to health check.
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
ed86f7c60d Merge pull request #32251 from AkihiroSuda/run-mount
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
2017-04-05 22:34:47 +02:00
19149ea4f2 Edits to CLI reference
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 6d3eecd8cf303f9f1588ef851e3bd8fe83fcbb8d
Component: engine
2017-04-05 11:27:09 -07:00
5be33d2273 Merge pull request #30424 from yongtang/30376-node-ls-format
Add `--format` for `docker node ls`
Upstream-commit: 833f1f44245c9e9514b931b19831ee58594f6b10
Component: engine
2017-04-05 16:53:54 +02:00
6c1668c7bd cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
2017-04-05 04:52:08 +00:00
b6572ab4d8 Merge pull request #32358 from mstanleyjones/fix-liquid
Escape some double brackets
Upstream-commit: 8d96619e5a367798cffcb740cfc41e0a505a5232
Component: engine
2017-04-05 00:35:45 +02:00
594d540270 Merge pull request #32352 from KarthikNayak/32174
Docs: Add the flag `--api-enable-cors` to deprecated.md
Upstream-commit: b9e9518bfee26e859eee1cbd4b6ca9e7be637c42
Component: engine
2017-04-04 15:22:04 -07:00
964a70f1c3 Add hidden placeholder of .Self for docker node ls --format
This commit adds a hidden placeholder of `.Self` for
`docker node ls --format` so that if the node is the same
as the current docker daemon, then a `*` is outputed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7328ae12cc3e14b3eb6ab01f09f6d94a82a44066
Component: engine
2017-04-04 12:46:44 -07:00
c7270d4d81 Add --format for docker node ls
This fix tries to address the comment https://github.com/docker/docker/pull/30376#discussion_r97465334
where it was not possible to specify `--format` for `docker node ls`. The `--format` flag
is a quite useful flag that could be used in many places such as completion.

This fix implements `--format` for `docker node ls` and add `nodesFormat` in config.json
so that it is possible to specify the output when `docker node ls` is invoked.

Related documentations have been updated.

A set of unit tests have been added.

This fix is related to #30376.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 32e21ecbfe3af9a8b5762ad1a549518221c4939e
Component: engine
2017-04-04 11:26:35 -07:00
e742ab9dfb Escape some double brackets
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 622bdadfd713b03932c5b142ac46915483a0cb04
Component: engine
2017-04-04 10:06:32 -07:00
a23d7a9c18 Merge pull request #30813 from yongtang/30232-service-ls-ports
Add `PORTS` field for `docker service ls` (`ingress`)
Upstream-commit: fe4d7db1eceae8aad6a27d0ce4164ae4bf974346
Component: engine
2017-04-04 17:04:27 +02:00
05f99a7915 Docs: Add the flag --api-enable-cors to deprecated.md
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Upstream-commit: 85f92ef3590b386ea17e3948262725a2d3ce4db5
Component: engine
2017-04-04 20:04:42 +05:30
5c8467c21d Merge pull request #32288 from pacoxu/patch-2
fix documentation error: volume-opt in service create
Upstream-commit: b1dcf5e9a55f6673e5b3b1526c1a1fb648ead2af
Component: engine
2017-04-04 13:50:05 +02:00
881ae30412 Add PORTS field for docker service ls (ingress)
This fix is related to 30232 wherw `docker service ls`
does not show `PORTS` information like `docker service ps`.

This fix adds `PORTS` fields for services that publish
ports in ingress mode.

Additional unit tests cases have been updated.

This fix is related to 30232.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c877c7b2bf0ed20ff9054dcbec98362d9e88c145
Component: engine
2017-04-03 18:40:15 -07:00
84fd8f0bc0 Merge pull request #31144 from aaronlehmann/synchronous-service-commands
Synchronous service create and service update
Upstream-commit: 21ec12b9676f95aaa69c3082b97d0b10031cc90a
Component: engine
2017-04-03 17:44:03 -07:00
e84d96f81f Synchronous service create and service update
Change "service create" and "service update" to wait until the creation
or update finishes, when --detach=false is specified. Show progress bars
for the overall operation and for each individual task (when there are a
small enough number of tasks), unless "-q" / "--quiet" is specified.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 330a0035334871d92207b583c1c36d52a244753f
Component: engine
2017-04-03 09:46:01 -07:00
08931d138b Merge pull request #32265 from breuner/patch-1
Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit d0057bd12dae5276b83e931e9e9ea185c58486a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5df76be5086fe5fee747be85fc92a0bb3ae8dada
Component: engine
2017-04-02 12:27:54 +02:00
f82dd4d1b5 fix documentation error: volume-opt in service create
Signed-off-by: pacoxu<paco.xu@daocloud.io>
Signed-off-by: pacoxu <paco.xu@daocloud.io>
Upstream-commit: 775c66a58c620d9f1b469f9248a733b1d29f21c8
Component: engine
2017-04-01 11:54:09 +08:00
aa11c20963 Clarify meaning of docker attach
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 1922eac4cc7190e1f3fa98796e7613c3e5b8b2bd
Component: engine
2017-03-31 13:22:21 -07:00
f66bd50c2b Merge pull request #28696 from jlhawn/deprecate_graph_flag
Deprecate --graph flag; Replace with --data-root
Upstream-commit: 1ecaed0a99331ff6140e0a714e1b50d466597775
Component: engine
2017-03-31 10:51:15 +02:00
1c4402820f Merge pull request #32199 from yuexiao-wang/add-examples
provide `docker stack ps` examples
Upstream-commit: 36c2f2731da40dcd8f9bf0e05a5257179da28eb4
Component: engine
2017-03-30 15:02:48 +02:00
928807d9bf provide examples
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: dcb4351d38607891b2d348a38951557ebef9c9fc
Component: engine
2017-03-31 05:11:36 +08:00
719f2c6960 Add conflict check for flags, and update deprecation versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: df7a72cffa7f28c67fb25eecd113dc21822afcc0
Component: engine
2017-03-30 12:21:05 +02:00
fd940e1e8e Deprecate --graph flag; Replace with --data-root
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 261ef1fa27c4dfefa5f686b0a4ef354a43040e58
Component: engine
2017-03-30 11:24:56 +02:00
2c4ec5df35 fix inconsistency for
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6d50737355f748cbb49d304d0b2dbfe5a17dfd16
Component: engine
2017-03-30 05:42:18 +08:00
55ffbd6769 Delete extraneous H1 title
Signed-off-by: JimGalasyn <jim.galasyn@docker.com>
Upstream-commit: 8d0c05cfe46607482e1ca5e4b1d80de80b8e5d8f
Component: engine
2017-03-28 10:56:26 -07:00
18d5857e95 Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
Updated push.md with progress bar info
Upstream-commit: a048e131beaa32330ce423259f33863f969b2533
Component: engine
2017-03-28 14:02:10 +02:00
c616d67251 Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
Update docs for experimental features
Upstream-commit: bd811aa4fde8632197c96ca3a7af039789768107
Component: engine
2017-03-28 14:01:05 +02:00
21cd677849 Merge pull request #31901 from davidxia/fix-docs
[docs] Fix incorrect `docker inspect` example
Upstream-commit: b385a9156ea56e8e8fe91576196761e17a509469
Component: engine
2017-03-28 14:00:05 +02:00
b8233dd3d5 Merge pull request #30810 from allencloud/make-secret-ls-support-filter
make secret ls support filters in CLI
Upstream-commit: 4df350b8c7a53dc82d8a6e187882faf8f90ce766
Component: engine
2017-03-28 13:43:19 +02:00
8cfb32ea06 Update docs for experimental features
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9fd27bf1a9a443de5f9f263d63af0ffbc2265dcb
Component: engine
2017-03-28 13:25:11 +02:00
585efde395 Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
Fix indenting in deprecated engine features toc
Upstream-commit: 0f8a3dafa4d8e1fb2afd8c1d67ded46db3e5da62
Component: engine
2017-03-28 13:09:47 +02:00
88ed1bfdd3 Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc
specify max size for secret in doc
Upstream-commit: 7c7cc0bbdc69ba7039b012dd0e73867bf2ab7699
Component: engine
2017-03-28 12:59:19 +02:00
798aa28677 Merge pull request #32112 from vdemeester/carry-ref-inspect-detail
Add details for inspect command usage
Upstream-commit: 54805701bd73d692fccd02c7c691fa293ab2e39a
Component: engine
2017-03-28 12:49:57 +02:00
d4390b9105 Add details for inspect command usage
Signed-off-by: Eric G. Noriega <egnoriega@users.noreply.github.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 59ef08c87836cab7540c07403a19ae5ea4eb85b9
Component: engine
2017-03-28 11:04:10 +02:00
69b0fc45bc Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands
Add cli reference docs for root-level commands
Upstream-commit: cf113faca649fef70990677f0f4fd2b14e0af038
Component: engine
2017-03-28 09:46:32 +02:00
7722df7d0b specify max size for secret in doc
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5f8fcd9d63c055262da82306273034060a3bb306
Component: engine
2017-03-28 10:17:03 +08:00
3ee40f07d5 Merge pull request #30974 from erxian/add-new-cli-argument-squash-to-docker-build
add docs to describe experimental CLI argument --squash to docker build
Upstream-commit: 91f3f992f156bebb79d80f022c111943dea0f5b0
Component: engine
2017-03-27 17:09:54 +02:00
51025ebc27 Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
Upstream-commit: 04295d26df3034a9a92da8400418f843d7c48780
Component: engine
2017-03-27 07:30:42 -07:00
899dc9491e Add cli reference docs for root-level commands
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9cea26bc7797789e4be2309153bd49c234544d2d
Component: engine
2017-03-27 11:10:58 +02:00
0bc9fdd1d1 make secret ls support filters in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 3935074016697b14023371b84b68c62fa1f3344e
Component: engine
2017-03-27 10:16:45 +08:00
d79afa43f8 Allow user to modify ingress network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: d59d19c32818ed73cc6b4d153f2858c4fe97f50e
Component: engine
2017-03-26 15:46:18 -07:00
0c4052f0d9 Merge pull request #32075 from uhayate/update_old_docs
update 3 old docs about secret in docs/reference/commandline/
Upstream-commit: a0b6edeb332e639dba35c53bda399dd56812a654
Component: engine
2017-03-26 12:41:37 +02:00
c6513c704e Updated push.md with progress bar info
Signed-off-by: Ian Philpot <ian.philpot@microsoft.com>
Upstream-commit: f426e8cb82756a43c2b1018d2cb98142b06eb3e0
Component: engine
2017-03-24 10:25:52 -04:00
3747c785b6 update 3 old docs about secret in docs/reference/commandline/
Signed-off-by: uhayate <uhayate.gong@daocloud.io>
Upstream-commit: 208653e712dfaf4ee3be0cf5c33cbb8cbfa7421d
Component: engine
2017-03-24 18:42:38 +08:00
d918c4ba81 Add --filter scope=swarm|local for docker network ls
This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.

As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.

This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.

Related docs has been updated.

Additional unit test cases have been added.

This fix fixes 31324.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 704ea8f6b4ad6f43c348affe357994d440aaf3de
Component: engine
2017-03-23 18:48:11 -07:00
4425fecafd Fix indenting in table of contents
Fixes #30841. The "filter" section had the wrong header size, which
caused sections following it to have the wrong indentation in the
right-side table of contents.

Signed-off-by: Greg Pflaum <gpflaum@users.noreply.github.com>
Upstream-commit: 44cdab1fc51558ff7d608d777549bd1e81b36ab8
Component: engine
2017-03-22 23:31:13 -04:00
ed9e56a592 Merge pull request #31715 from anusha-ragunathan/ipc-host
Add support in plugin config for accessing host ipc and pid namespace.
Upstream-commit: 0caced4644c0b188b9644e9ab5fe7a31ac855968
Component: engine
2017-03-22 14:17:21 -07:00
df8db8303f remove the duplicate line from doc and rebase with master for 'example of ADD and COPY with special characters file name'
Signed-off-by: Foysal Iqbal <foysal.iqbal.fb@gmail.com>
Upstream-commit: dacf8fa27c576512cecea4a15b9adb93808c9743
Component: engine
2017-03-22 15:08:17 -04:00