aedba1db46
Merge pull request #31683 from AkihiroSuda/it-on-swarm-easy-analysis
...
integration-cli-on-swarm: new CLI flag: -keep-executor
Upstream-commit: 917cb0d9d0cb97a954548b658c247ecbef664f10
Component: engine
2017-03-28 15:50:52 +02: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
a904ff4596
Merge pull request #32156 from cpuguy83/index_copy_new_slice
...
Don't pass reference to mutable slice
Upstream-commit: 95510551cea4a1211070ecdc5f1319f5aa2c9a7c
Component: engine
2017-03-28 10:23:08 +02:00
a71cefb645
Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE
...
Windows: Revert change to wait for OOBE
Upstream-commit: 1c7a3d3e6c03e911775d8bed8675d5bc5dc1cfcd
Component: engine
2017-03-28 10:22:03 +02:00
3670f999ce
Merge pull request #30763 from ripcurld0/fix_30714
...
Fix the create API when fromSrc has a bad URL
Upstream-commit: 35e5975b9049f341f947c1bf281b06af45cb1a48
Component: engine
2017-03-28 10:20:59 +02:00
69182c0d50
Merge pull request #31709 from dnephin/better-errors
...
Replace fmt.Errorf() with errors.Errorf() in the cli
Upstream-commit: 99aaf6b9233d0a0a577e79f536288bca36794c50
Component: engine
2017-03-28 10:17:46 +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
d247c210cb
Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename
...
Set the alias to the service name instead of the network name
Upstream-commit: 4155343f444c2fc6204447d0102a640425636e6c
Component: engine
2017-03-28 09:46:05 +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
37e3d52b2f
Do not replace fmt.Errorf in generated file
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0d088186536aa480eea92f55f33ee41f66cec1a3
Component: engine
2017-03-27 18:33:41 -07:00
80739547ec
Don't pass reference to mutable slice
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d5b7839008f80a82063869c43ee197a3b6781ca3
Component: engine
2017-03-27 21:23:06 -04:00
5f5b8fe9f6
Manually reorganize import paths to segregate stdlib and 3rd-party packages
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: febbe3879695c46d243ce806713038e0c1582806
Component: engine
2017-03-27 18:21:59 -07:00
753f67cb4f
Windows:Revert change to wait for OOBE
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6eed7f0cac10495c95a8e4b74548e707af933f8c
Component: engine
2017-03-27 14:32:18 -07:00
43cc695e6b
Merge pull request #32077 from zigarn/build-output
...
Display created tags on successful build
Upstream-commit: c5f178da05b27bda40c863b7d65ef8ef11eb1fbe
Component: engine
2017-03-27 12:41:13 -07:00
bffbe27e5c
Merge pull request #32146 from mapk0y/fix-man-docker-run
...
Update "man" of docker-run
Upstream-commit: 2413859a1f039f577414c5d37d9347876ea43708
Component: engine
2017-03-27 21:36:04 +02:00
1c78b003d4
Update "man" of docker-run
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
Upstream-commit: 22f0b27f59aacd1f9028a8d2ea37e1ed6372675e
Component: engine
2017-03-28 02:50:57 +09:00
723b938620
Merge pull request #32107 from mkumatag/fix_api_doc
...
Fix Healthcheck API doc
Upstream-commit: abecc530ee28ca4accb295c83f762855732d2667
Component: engine
2017-03-27 18:45:48 +02:00
d37ed1a2fe
Merge pull request #32114 from sdurrheimer/zsh-completion-network-ls-scope-filter
...
Add zsh completion for 'docker network ls --filter scope'
Upstream-commit: ae811e9597475c7437ba3c14ed2a21d199bb6c77
Component: engine
2017-03-27 18:36:08 +02:00
ed513ca3d1
Merge pull request #32115 from sdurrheimer/zsh-completion-plugin
...
Add missing zsh completion for 'docker plugin ls'
Upstream-commit: b9c8d9c66085263ac239e9122af80e4c2bb0d6d0
Component: engine
2017-03-27 18:35:16 +02: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
9d93e56a18
Merge pull request #32044 from jonisar/patch-1
...
Readme grammer fix
Upstream-commit: 1bb6a53e767f883cc58c716a477b27383b185833
Component: engine
2017-03-27 16:20:45 +02:00
333f4f4d72
Set the alias to the service name instead of the network name
...
This makes it work a little closer to compose part and it is more
correct 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ee08c8542aed078e06f1d9c559d62560e97f371d
Component: engine
2017-03-27 11:42:15 +02: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
617bd84818
Merge pull request #32119 from nogoegst/fix-openbsd-cli
...
Fix building client on OpenBSD
Upstream-commit: dc1f036772439d08c81cd8eef92d661b7fafbd0e
Component: engine
2017-03-27 09:52:50 +02:00
1499a412b6
Merge pull request #31755 from miaoyq/heartbeat-maybe-zero
...
The variable heartbeat might be 0
Upstream-commit: e2f60837ebbf432b89af900105afe73121cf6c05
Component: engine
2017-03-27 09:39:01 +02:00
9d1e7a4f10
Merge pull request #32121 from allencloud/remove-redundant-comment-in-test-build
...
remove redundant comments in test build.go
Upstream-commit: e5d474e856623fbd35a01387b6580fbfcaa30d05
Component: engine
2017-03-27 14:40:37 +09:00
d840f6fbf0
remove redundant comments in test build.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 32b81dae29fbb6f831cda5e9db1c120f78cd4a91
Component: engine
2017-03-27 10:59:13 +08: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
92497be019
The variable heartbeat might be 0
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
perfect the test case for 'discoveryOpts'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: fb2bc3521069b55bbb342305e533e78682fbcc65
Component: engine
2017-03-27 10:07:58 +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
d50bce7193
Fix building client on OpenBSD
...
Signed-off-by: Ivan Markin <twim@riseup.net >
Upstream-commit: 925bc27b8108a154161b578e176d2b7d79e8002c
Component: engine
2017-03-26 20:47:18 +00:00
ea3425ec90
Add missing zsh completion for 'docker plugin ls'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: fd6e74491b812f548e999991200d3a784ea3b9f8
Component: engine
2017-03-26 17:33:05 +02:00
76a233e2ba
Add zsh completion for 'docker network ls --filter scope'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0bd255f39762d6c45c2b6a33f3467716ff8f3b42
Component: engine
2017-03-26 17:04:59 +02:00
7006be9c48
Fix Healthcheck API doc
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 4df54695ef12fa0ba474b571771ed09232ad00ba
Component: engine
2017-03-26 08:45:11 -04:00
abc5bcad87
Fix the create API when fromSrc has a bad URL
...
When sending a bad URL in the fromSrc parameter using cURL
the response will have status code 200 while it should have 404
or 500 (depends on the error).
This commit addresses this problem in the following ways:
* Before, `src` was parsed using url.Parse and if the
returned `url.Scheme` was empty it was set to 'http'
and `url.Host` was set to `src`.
This is bad because if `src` was 'web.com/tars/image1.tar'
The `url.String()` returns 'web.com%2Ftars%2Fimage1.tar`
which will cause the daemon to fail downloading the file
* Before writing the "Downloading" message, the image
is attempted to be downloaded and if there is no error
the "Downloading" message is sent.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: e050f1760dd8a3d48d95bb3d2de503fc4177ff5f
Component: engine
2017-03-26 15:21:13 +03:00
f1d1b03a72
Readme grammer fix
...
"Giving THE developer...." -> "to express all THEIR application's.."
A developer is single.
"Their" refers to plural (multiple developers).
So, adjusted to plural ("developers") so that the two will match.
* The alternative would be to use "his / her" but that leads to gender reference issues, so the former alternative works better
Signed-off-by: Jonathan Saring <yoni@cocycles.com >
Upstream-commit: ce08e2a107bd43829ca6f7f394a10956c03ebe28
Component: engine
2017-03-26 14:59:14 +03:00
6a15e35779
Merge pull request #32098 from anusha-ragunathan/volume-panic
...
Add non-nil check before logging volume errors.
Upstream-commit: 08544b1912734d31dac9632e9bfba07ed9601ff4
Component: engine
2017-03-26 12:45:22 +02:00
ee135bdc50
Merge pull request #31976 from Microsoft/jjh/csbooboo
...
Windows: Remove --credentialspec flag
Upstream-commit: ab08a571d1181833c5598ed3d27f9d2a924762d0
Component: engine
2017-03-26 12:44:27 +02: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
d81627e7d7
Merge pull request #32052 from Microsoft/jjh/revendorhcsshim
...
Revendor HCSShim @ v0.5.13
Upstream-commit: e065acc5fa2bf727ab72918e9a555571d83028be
Component: engine
2017-03-26 12:04:30 +02:00
ac093860f7
Display created tags on successful build
...
Signed-off-by: Alexandre Garnier <alexandre.garnier@zenika.com >
Signed-off-by: Alexandre Garnier <zigarn@gmail.com >
Upstream-commit: d0052198300dfe9fd220f780184d1ec82c50006c
Component: engine
2017-03-25 11:46:20 +01:00
