Commit Graph

29795 Commits

Author SHA1 Message Date
e827e3506f Merge pull request #30197 from yongtang/30178-service-health-check-none
Fix issue where service healthcheck is `{}` in remote API
Upstream-commit: 09114fe9f0fcfaa97be46c3142b8b64aacc94571
Component: engine
2017-02-07 17:17:26 +01:00
1be829bb74 Merge pull request #30789 from vdemeester/carry-update-docker-stack-experimental
Update docker stack experimental notes
Upstream-commit: c5a592a0a43ef3ce5a6d0644427cbe7011213f63
Component: engine
2017-02-07 08:11:26 -08:00
3f7730c74a Merge pull request #30734 from allencloud/add-400-status-code-for-events-endpoint
add status code 400 for api endpoint /events
Upstream-commit: f3da980a459c11a35248daa8a6be9919bf65fda2
Component: engine
2017-02-07 17:02:50 +01:00
edcb479225 Merge pull request #30639 from Microsoft/jjh/makeshortcut
Windows: Make.ps1 default to build binaries
Upstream-commit: 0a51ad2586a68ed7fd7e3547594630f07d8c9ee3
Component: engine
2017-02-07 07:39:33 -08:00
aad0552893 Update docker stack experimental notes
Update command usage and help.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3225150b164c97e5e67893e93f45888d552f4919
Component: engine
2017-02-07 15:17:47 +01:00
5a2fed241e fix some types on errors and form
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
Upstream-commit: ac9c47e26f57a0fa2fed95a1fb1bf6c9410a3b60
Component: engine
2017-02-07 20:29:32 +08:00
0c640a030b Make sure we validate simple syntax on service commands
We ignored errors for simple syntax in `PortOpt` (missed that in the
previous migration of this code). This make sure we don't ignore
`nat.Parse` errors.

Test has been migrate too (errors are not exactly the same as before
though -_-)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aa4ecd153b88644a53b23b7c46332d9b50007930
Component: engine
2017-02-07 12:45:47 +01:00
0bc7415047 fetch the latest code with zero-harm but good-readability for Graylog2/go-gelf
update vendor.conf for github.com/Graylog2/go-gelf

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: 79d47a3bb763689bb7ea64da8a24c8ecfa6181c8
Component: engine
2017-02-07 17:27:17 +08:00
a0487c75eb Merge pull request #30771 from tophj-ibm/fix-manpages-p-z
ppc64le and s390x fixes for manpages
Upstream-commit: 09e99ef1fcbbcb8f1551298244ad8ac214cf2625
Component: engine
2017-02-06 21:53:19 -08:00
207b36b0ce Merge pull request #30774 from aaronlehmann/swarm-leave-docs-fix
Fix grammatical error in swarm_leave.md
Upstream-commit: 9e80a2a457a93b625aea72db42bb2f820d2b5b10
Component: engine
2017-02-06 21:33:12 -08:00
d916d66338 Merge pull request #30773 from aboch/gn
getAllNetworks unnecessary walks all the networks
Upstream-commit: 7c7be8423842768d174f9091c7adfc2e89c1a24d
Component: engine
2017-02-06 20:28:30 -08:00
48134e2cad Fix grammatical error in swarm_leave.md
Correct this sentence so it reads correctly. "to on a manager" should be
"on a manager".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 248b1c23d37e1e32af66583f8d14d9f8742280ef
Component: engine
2017-02-06 17:31:55 -08:00
1a76374f64 getAllNetworks unnecessary walks all the networks
- libnetwork controller Networks() already returns
  a copy list. Also Networks() correctly skips any
  network which ahs already been marked for deletion
  while getNetworks implementation bypass this.

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5d71cc01b6bb089a70fa1e855943dab0d88439bb
Component: engine
2017-02-06 16:37:51 -08:00
404093c291 Merge pull request #30732 from stevvooe/validate-mounts-at-start
cluster/executor: check mounts at start
Upstream-commit: 41864ca0ecc5c515f870cae862c286bb38cc1bf6
Component: engine
2017-02-06 15:01:48 -08:00
1c501e8036 added ppc64le and s390x fixes for manpages
Fixes manpages for p and z by downloading a specific version
of go instead of relying on the distro version.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 5bec1b686481244698474a0103c0994b25c5c79c
Component: engine
2017-02-06 17:51:37 -05:00
a7aa5f4c3b Merge pull request #30755 from andrewhsu/golang-1.7.5-for-manpages
use golang 1.7.5 for building man pages
Upstream-commit: 94c4c68607fcc61d28a424ee3aa33e0c233a9307
Component: engine
2017-02-06 14:48:28 -08:00
770410c730 Merge pull request #30749 from yongtang/28005-docker-stats-header-windows
Fix Windows `docker stats` showing Linux headers
Upstream-commit: 90709776c5a78bcfab226c19ccb6fa21c3f272f6
Component: engine
2017-02-06 14:09:23 -08:00
3b9f4a63b1 Merge pull request #30136 from tg123/master
Windows: return err instead of panic when convert string to utf16
Upstream-commit: d38753303a60181acbf15c8e01a223f2013439c8
Component: engine
2017-02-06 14:00:00 -08:00
b6e3ac9b99 remove musl-dev in man/Dockerfile.armhf
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 1c7a66eda768dcdcc210c7c43d80770bfb59b435
Component: engine
2017-02-06 13:32:21 -08:00
0ba6f88a03 cluster/executor: check mounts at start
While it is important to not create controllers for an invalid task,
certain properties should only be checked immediately before use. Early
host validation of mounts prevents resolution of the task Executor when
the mounts are not relevant to execution flow. In this case, we have a
check for the existence of a bind mount path in a creation function that
prevents a task controller from being resolved. Such early validation
prevents one from interacting directly with a controller and result in
unnecessary error reporting.

In accordance with the above, we move the validation of the existence of
host bind mount paths to the `Controller.Start` phase. We also call
these "checks", as they are valid mounts but reference non-existent
paths.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 92899ffac8ca1136e807dd234e8fa1dd49db7801
Component: engine
2017-02-06 13:09:53 -08:00
df1c58e788 Update distribution vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 24698a07cba89a08ac6fcc2c6e4097491b922883
Component: engine
2017-02-06 13:06:52 -08:00
bcfb515abf Merge pull request #30764 from tiborvass/stacktrace-debug-mode
Show stacktrace in daemon logs only if 500 internal error
Upstream-commit: dc15fe8a34df42a97d20b26338dc5ef13897c9fa
Component: engine
2017-02-06 12:41:50 -08:00
f29b0ab9bd Merge pull request #30742 from yongtang/29975-compose-network-attachable
Add compose support of `attachable` in networks
Upstream-commit: e06ae6f41955acad6f614f9e88b79672862ec26c
Component: engine
2017-02-06 12:27:44 -08:00
8b439bbd93 Merge pull request #30701 from allencloud/add-status-code-404-for-plugin-in-api-doc
add status code 404 for plugin api endpoint enable and disable
Upstream-commit: 0113128b2a79a9cef9950e71e0681380b240faf4
Component: engine
2017-02-06 11:53:17 -08:00
264f6d8260 Merge pull request #30753 from NickrenREN/daemon-register
remove Register return value
Upstream-commit: b11f988dd003f702dcdbdc4dcab986c068d68a0f
Component: engine
2017-02-06 11:47:17 -08:00
7942fcb4f0 Merge pull request #30769 from tianon/prompt-for-confirmation
Fix "command.PromptForConfirmation" to accept "enter" for the "N" default
Upstream-commit: d4136eb5251132f4b841fd74fa8a0d74c156069e
Component: engine
2017-02-06 11:44:45 -08:00
daca41d5ee use precompiled go from google, needs debian to work
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a6886bfc5253453b79cdddd7f8412b29356fd02b
Component: engine
2017-02-06 11:29:25 -08:00
3da9fbe9c3 Merge pull request #30760 from justincormack/yamlup
Update Go Yaml
Upstream-commit: 00d2057698e078ff55ea05044af41a94d704538f
Component: engine
2017-02-06 11:14:55 -08:00
7fb8ca1684 Merge pull request #30690 from aboch/vnd
Vendoring libnetwork @802895f
Upstream-commit: 1d3f6e4aaf8e83787a22017bd686c6d04c727710
Component: engine
2017-02-06 13:20:51 -05:00
0ff5a04abc Show stacktrace in daemon logs only if 500 internal error
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f7d9bb62483fa160553ef17840b1f974b12885ac
Component: engine
2017-02-06 10:13:21 -08:00
3b3c271a31 Fix "command.PromptForConfirmation" to accept "enter" for the "N" default
This adjusts `command.PromptForConfirmation` in `cli/command/utils.go` to use `bufio`'s `ReadLine` rather than using `fmt.Fscan` for reading input, which makes `<Enter>` properly accept the default value of "No" as one would expect.

This new code actually came from `cli/command/plugin/install.go`'s `acceptPrivileges` function, which I've also refactored here to use `command.PromptForConfirmation` as it should.

Additionally, this updates `cli/command/plugin/upgrade.go`'s `runUpgrade` function to use `command.PromptForConfirmation` for further consistency.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 2198b0568f7b7137545757c896191ef2a2bc720e
Component: engine
2017-02-06 09:13:07 -08:00
969d829731 Update Go Yaml
- changes license to Apache from LGPLv3
- small fixes for Go 1.8, parsing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 08304e853863b3c78a7455923b55349c2e3c9334
Component: engine
2017-02-06 13:08:58 +00:00
f3c8bbef1f Merge pull request #30710 from albers/completion-service--format
Add bash completion for `(stack services|service ls) --format`
Upstream-commit: 191719e39af721c5dda955e4aafa64eeb643dad8
Component: engine
2017-02-06 11:44:26 +01:00
54e19fa73c Merge pull request #30683 from milindchawre/fix_30503
Adding support for docker max restart time
Upstream-commit: 67dffe2741a1f56de0a8225988765bc5baa543fc
Component: engine
2017-02-05 23:33:31 -08:00
8dc75c5438 from golang:1.7.5-alpine for docker-manpage-dev
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 7b52ec5f103bc026b47e58f2c4dfe46b9bd83c32
Component: engine
2017-02-05 22:40:57 -08:00
5926ef0392 remove Register return value
Since Register() will never return err,remove the return value

Signed-off-by: NickrenREN <yuquan.ren@easystack.cn>
Upstream-commit: 78b50c129e06ceab460648b9c84d464b4c34cfee
Component: engine
2017-02-06 12:44:24 +08:00
73bb99d09d NetworksPrune: do not return warnings as error
`NetworksPrune()` is designed to ignore errors
encountered during removal of networks, and only
print them as warnings.

However, the last error encountered was returned
by the function, resulting in the prune command
to be reported as "failing" wheras it did not.

In addition, in situations where a network
failed to be removed, the networks that
_were_ succesfully removed were not reported
back.

This patch changes the function to not return
the error, and to return the list of networks
that were succesfully removed at all times.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 06c4c5f4996bb8890fa0546de2d192217341ada8
Component: engine
2017-02-05 16:18:27 -08:00
190522d7df Fix Windows docker stats showing Linux headers
This fix is an attempt to fix issue raised in #28005 where
`docker stats` on Windows shows Linux headers if there is
no containers in stats.

The reason for the issue is that, in case there is no container,
a header is faked in:
https://github.com/docker/docker/blob/v1.13.0/cli/command/formatter/formatter.go#L74-L78
which does not know OS type information (as OS was stored with container stat entries)

This fix tries to fix the issue by moving OS type information
to stats context (instead of individual container stats entry).

Additional unit tests have been added.

This fix fixes #28005.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0a3a3ba2b62a5720d949e93fd580d3cf797cfa9e
Component: engine
2017-02-05 08:55:30 -08:00
ba62bc02bb Merge pull request #30290 from vdemeester/carry-pr-27834
Carry #27834 — Do not require `.git` in the build context
Upstream-commit: 4af2555a353a8f407c49adb57877ead436af04be
Component: engine
2017-02-04 19:19:16 -08:00
a86724bb15 Add compose support of attachable in networks
This fix tries to address the issue raised in 29975 where
it was not possible to specify `attachable` flag for networks
in compose format.

NOTE: Compose format aleady supports `labels` in networks.

This fix adds the support of `attachable` for compose v3.1 format.

Additiona unit tests have been updated and added.

This fix fixes 29975.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cf4b7a5b876cfa91a1bea22d248e4925c8e2bf71
Component: engine
2017-02-04 14:16:06 -08:00
03aaf44639 Merge pull request #30187 from thaJeztah/show-error-on-unsupported-flags
print error if unsupported flags are used
Upstream-commit: f538c4bd3c203a4d49711fd7807cdd4bb4182e70
Component: engine
2017-02-04 22:43:51 +01:00
1a6864c6d3 Merge pull request #30686 from anusha-ragunathan/windowsPath
Add Windows specific exec root for plugins.
Upstream-commit: eb6b972c493cf67d8adbc1f7cf6f0de69eff71e9
Component: engine
2017-02-04 16:12:16 +01:00
a3638a3c5b Merge pull request #28751 from ijc25/wrap-help-output
Wrap CLI --help output to terminal width
Upstream-commit: fac13e4e0764c551c5452e6f8fbcde45cf67ff12
Component: engine
2017-02-03 23:04:11 -08:00
fe36f50059 add expose and publish filter in swagger.yml and CLI docs for docker/master
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 44bd658913647ddadc3c225233c08ee61ef3c5ed
Component: engine
2017-02-04 14:28:14 +08:00
84924e41d8 add missing filter type and sort filter type in alphabets
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: da1f05d66de409294e535fbefb968ce040248e3e
Component: engine
2017-02-04 14:25:55 +08:00
8dc7e39e0a add status code 400 for api endpoint /events
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 323f575087d7e2068d74598283ec485b1f115226
Component: engine
2017-02-04 13:40:24 +08:00
5d5f0fee1c Adding support for docker max restart time
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: 9bd3a7c0297fdb93deb846070c85ac23da0a20e8
Component: engine
2017-02-04 03:54:47 +00:00
327117961b Merge pull request #30553 from lewisdaly/21050-improve-user-namespace-docs
Updated dockerd docs with note about user namespaces
Upstream-commit: d6b1b532a1e12c4969772519cb2643b285d1318f
Component: engine
2017-02-03 19:48:06 -08:00
6fc03b6025 Updated dockerd docs with note about user namespaces
Signed-off-by: Lewis Daly <lewisdaly@me.com>

Updated uid/gid reference to be more canonical - and signed commit

Signed-off-by: Lewis Daly <lewisdaly@me.com>

Editorial suggestion

I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.

Editorial suggestion

I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.
Upstream-commit: 2f9280dcd05f965a24c2f4112a328be59f116412
Component: engine
2017-02-04 13:50:50 +10:30
7b0b9f56f9 Merge pull request #30673 from mavenugo/nr
List Networks need not pull all the endpoints
Upstream-commit: 4dbc105fc1dc572577f48a69fcecc475ba81b576
Component: engine
2017-02-03 19:09:43 -08:00