Commit graph

31655 commits

Author SHA1 Message Date
Sebastiaan van Stijn
cf113faca6 Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands
Add cli reference docs for root-level commands
2017-03-28 09:46:32 +02:00
Vincent Demeester
4155343f44 Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename
Set the alias to the service name instead of the network name
2017-03-28 09:46:05 +02:00
allencloud
5f8fcd9d63 specify max size for secret in doc
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-28 10:17:03 +08:00
Tibor Vass
0d08818653 Do not replace fmt.Errorf in generated file
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-27 18:33:41 -07:00
Brian Goff
d5b7839008 Don't pass reference to mutable slice
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-27 21:23:06 -04:00
Tibor Vass
febbe38796 Manually reorganize import paths to segregate stdlib and 3rd-party packages
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-27 18:21:59 -07:00
Darren Stahl
6eed7f0cac Windows:Revert change to wait for OOBE
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-03-27 14:32:18 -07:00
Tõnis Tiigi
c5f178da05 Merge pull request #32077 from zigarn/build-output
Display created tags on successful build
2017-03-27 12:41:13 -07:00
Vincent Demeester
2413859a1f Merge pull request #32146 from mapk0y/fix-man-docker-run
Update "man" of docker-run
2017-03-27 21:36:04 +02:00
mapk0y
22f0b27f59 Update "man" of docker-run
Signed-off-by: mapk0y <mapk0y@gmail.com>
2017-03-28 02:50:57 +09:00
Sebastiaan van Stijn
abecc530ee Merge pull request #32107 from mkumatag/fix_api_doc
Fix Healthcheck API doc
2017-03-27 18:45:48 +02:00
Sebastiaan van Stijn
ae811e9597 Merge pull request #32114 from sdurrheimer/zsh-completion-network-ls-scope-filter
Add zsh completion for 'docker network ls --filter scope'
2017-03-27 18:36:08 +02:00
Sebastiaan van Stijn
b9c8d9c660 Merge pull request #32115 from sdurrheimer/zsh-completion-plugin
Add missing zsh completion for 'docker plugin ls'
2017-03-27 18:35:16 +02:00
Alessandro Boch
3bf164e48d Do not panic on redundant UpdateAttachment
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-27 08:52:03 -07:00
Sebastiaan van Stijn
91f3f992f1 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
2017-03-27 17:09:54 +02:00
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
2017-03-27 07:30:42 -07:00
Vincent Demeester
1bb6a53e76 Merge pull request #32044 from jonisar/patch-1
Readme grammer fix
2017-03-27 16:20:45 +02:00
Vincent Demeester
ee08c8542a
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>
2017-03-27 11:42:15 +02:00
Vincent Demeester
9cea26bc77
Add cli reference docs for root-level commands
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-27 11:10:58 +02:00
Vincent Demeester
dc1f036772 Merge pull request #32119 from nogoegst/fix-openbsd-cli
Fix building client on OpenBSD
2017-03-27 09:52:50 +02:00
Vincent Demeester
e2f60837eb Merge pull request #31755 from miaoyq/heartbeat-maybe-zero
The variable heartbeat might be 0
2017-03-27 09:39:01 +02:00
Akihiro Suda
e5d474e856 Merge pull request #32121 from allencloud/remove-redundant-comment-in-test-build
remove redundant comments in test build.go
2017-03-27 14:40:37 +09:00
allencloud
32b81dae29 remove redundant comments in test build.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-27 10:59:13 +08:00
allencloud
3935074016 make secret ls support filters in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-27 10:16:45 +08:00
Yanqiang Miao
fb2bc35210 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>
2017-03-27 10:07:58 +08:00
Alessandro Boch
d59d19c328 Allow user to modify ingress network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-26 15:46:18 -07:00
Ivan Markin
925bc27b81 Fix building client on OpenBSD
Signed-off-by: Ivan Markin <twim@riseup.net>
2017-03-26 20:47:18 +00:00
Steve Durrheimer
fd6e74491b
Add missing zsh completion for 'docker plugin ls'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-26 17:33:05 +02:00
Steve Durrheimer
0bd255f397
Add zsh completion for 'docker network ls --filter scope'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-26 17:04:59 +02:00
Manjunath A Kumatagi
4df54695ef Fix Healthcheck API doc
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
2017-03-26 08:45:11 -04:00
Boaz Shuster
e050f1760d 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>
2017-03-26 15:21:13 +03:00
Joni Sar
ce08e2a107 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>
2017-03-26 14:59:14 +03:00
Vincent Demeester
08544b1912 Merge pull request #32098 from anusha-ragunathan/volume-panic
Add non-nil check before logging volume errors.
2017-03-26 12:45:22 +02:00
Vincent Demeester
ab08a571d1 Merge pull request #31976 from Microsoft/jjh/csbooboo
Windows: Remove --credentialspec flag
2017-03-26 12:44:27 +02:00
Sebastiaan van Stijn
a0b6edeb33 Merge pull request #32075 from uhayate/update_old_docs
update 3 old docs about secret in docs/reference/commandline/
2017-03-26 12:41:37 +02:00
Vincent Demeester
e065acc5fa Merge pull request #32052 from Microsoft/jjh/revendorhcsshim
Revendor HCSShim @ v0.5.13
2017-03-26 12:04:30 +02:00
Alexandre Garnier
d005219830 Display created tags on successful build
Signed-off-by: Alexandre Garnier <alexandre.garnier@zenika.com>
Signed-off-by: Alexandre Garnier <zigarn@gmail.com>
2017-03-25 11:46:20 +01:00
Tõnis Tiigi
773d3bb5a0 Merge pull request #32099 from dnephin/fix-test-stack-remove
Fix flaky TestStackRemove test
2017-03-24 23:23:25 -07:00
Anusha Ragunathan
b1570baadd Add non-nil check before logging volume errors.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-24 16:34:11 -07:00
Anusha Ragunathan
cddffe327e Merge pull request #32095 from anusha-ragunathan/set-state
Explictly set state of a disabled plugin.
2017-03-24 14:03:32 -07:00
Daniel Nephin
7b7ea8ab81 Replace fmt.Errorf() with errors.Errorf() in the cli
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 16:58:07 -04:00
Daniel Nephin
7236686987 Fix external volume error to pass validation.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 16:55:04 -04:00
Daniel Nephin
73e6135458 Fix flaky TestStackRemove test.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 15:31:08 -04:00
Thomas Tanaka
fc7cc1cc75 Update oracle linux selinux to match docker upstream
Add a dependency on specific selinux version for OL on docker-engine.spec

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
2017-03-24 12:17:39 -07:00
Anusha Ragunathan
bbbf64f712 Explictly set state of a disabled plugin.
While restoring plugins during daemon restart, some plugins can fail to
respond to net.Dial. These plugins should be explicitly set to disabled,
else they will retain their original state of enabled, which is
incorrect.

Tested with a plugin that fails to restart and observed that the state
was set to disabled.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-24 12:07:12 -07:00
Alessandro Boch
ff049a4d4d Vendor libnetwork @b6cb1ee
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-24 11:07:33 -07:00
Alessandro Boch
434e9695e4 Vendoring swarmkit @9fdea50
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-24 11:07:33 -07:00
Vincent Demeester
3c22c7d5e9 Merge pull request #32087 from dnephin/check-secrets-against-defined
Cleanup compose convert error messages
2017-03-24 17:41:53 +01:00
Daniel Nephin
b03a185723 Cleanup compose convert error messages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 10:43:28 -04:00
Ian Philpot
f426e8cb82 Updated push.md with progress bar info
Signed-off-by: Ian Philpot <ian.philpot@microsoft.com>
2017-03-24 10:25:52 -04:00