beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31630 commits 14 branches 412 tags 338 MiB
Commit graph

31630 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Vincent Demeester
b86efd2707 Merge pull request #32081 from albers/completion-network-ls--filter-scope 
Add bash completion for `network ls --filter scope`
 2017-03-24 14:52:03 +01:00
Harald Albers
4dd461a6bf Add bash completion for network ls --filter scope 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-24 13:06:26 +01:00
Sebastiaan van Stijn
4e290f7a2b Merge pull request #31529 from yongtang/31324-network-ls-filter-scope 
Add `--filter scope=swarm|local` for `docker network ls`
 2017-03-24 12:26:10 +01:00
uhayate
208653e712 update 3 old docs about secret in docs/reference/commandline/ 
Signed-off-by: uhayate <uhayate.gong@daocloud.io>
 2017-03-24 18:42:38 +08:00
Vincent Demeester
9a2dcf6a15 Merge pull request #32071 from tonistiigi/fix-integration-tests 
Fix integration tests build errors
 2017-03-24 10:30:42 +01:00
Vincent Demeester
8d2a82853c Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic 
[compose/interpolation] Make sure we error out instead of panic during interpolation
 2017-03-24 09:00:06 +01:00
Tonis Tiigi
4c7710d5d0 Fix integration tests build errors 
Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-24 00:27:32 -07:00
Akihiro Suda
8008f65293 Merge pull request #31608 from vdemeester/integration-cli-package 
[test-integration] Introduce a `cli` package for test-integration
 2017-03-24 13:04:47 +09:00
Tõnis Tiigi
2fa8fe400d Merge pull request #31257 from tonistiigi/nested-build 
build: add multi-stage build support
 2017-03-23 19:14:13 -07:00
Yong Tang
704ea8f6b4 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>
 2017-03-23 18:48:11 -07:00
Tibor Vass
caf8d884aa Merge pull request #31629 from darrenstahlmsft/ShutdownLock 
Windows: Stop holding client container lock during shutdown
 2017-03-23 18:16:56 -07:00
Tonis Tiigi
684633f734 Fix relative path on windows for uuid paths 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-23 15:12:19 -07:00
Tonis Tiigi
f95f58283b Add support for COPY from previous rootfs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-23 15:12:15 -07:00
Brian Goff
b47c50cf11 Merge pull request #31668 from Microsoft/jjh/nopidfileasservice 
Windows: no pidfile when service
 2017-03-23 17:10:35 -04:00
Brian Goff
c1d40ade5d Merge pull request #31626 from darrenstahlmsft/WindowsUpdateContainer 
Windows: Add missing HostConfig fields to update block
 2017-03-23 16:54:03 -04:00
Brian Goff
fd56e8ffa1 Merge pull request #32019 from anusha-ragunathan/plugin-sigkill 
Add missing test for daemon kill with plugins running.
 2017-03-23 15:46:59 -04:00
John Howard (VM)
4f7db6739d Revendor HCSShim @ v0.5.13 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-03-23 11:47:05 -07:00
Vincent Demeester
50c4475df6
Introduce a cli package for test-integration 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-23 18:35:22 +01:00
John Howard (VM)
53d6aadda5 Windows: Remove --credentialspec flag 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-23 10:01:04 -07:00
Sebastiaan van Stijn
ad530ffee0 Merge pull request #31986 from Microsoft/jjh/fix28267 
Windows: Don't close client stdin handle to avoid hang
 2017-03-23 16:35:54 +01:00
Vincent Demeester
c165a8bfa1
Make sure we error out instead of panic during interpolation 
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-23 16:09:57 +01:00
Vincent Demeester
d9ecb1b8fe Merge pull request #32028 from sdurrheimer/zsh-completion-service-ls-mode-filter 
Add zsh completion for 'docker service ls --filter mode'
 2017-03-23 14:19:36 +01:00
Vincent Demeester
f438cf6c7a Merge pull request #32029 from sdurrheimer/zsh-completion-secret-ls-format 
Add zsh completion for 'docker secret ls --format'
 2017-03-23 14:19:14 +01:00