a654d0d2d6
Merge component 'cli' from git@github.com:docker/cli master
2018-01-18 16:41:08 +00:00
3e6e651fda
Merge pull request #814 from dnephin/fix-builder-env-docs
...
Improve builder ENV docs
Upstream-commit: 4f550018bb
2018-01-17 23:26:42 +01:00
33df5a9f66
Update buidler ENV docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01b521c002
2018-01-17 16:55:07 -05:00
b602be47f6
Merge component 'engine' from git@github.com:moby/moby master
2018-01-17 17:04:48 +00:00
1c449fb090
Merge component 'cli' from git@github.com:docker/cli master
2018-01-17 16:41:12 +00:00
0e51141e24
Merge pull request #35441 from cpuguy83/plugin_timeout
...
Add timeouts for volume plugin ops
Upstream-commit: f0b0f2038d085066f340f24f3a9a9683bd4aa35f
Component: engine
2018-01-17 14:49:41 +01:00
19e1833a23
Merge pull request #36033 from cpuguy83/improve_zfs_debug_message
...
Improve zfs init log message for zfs
Upstream-commit: 1338fcf58aafed25c0da4952793fec1c4055c894
Component: engine
2018-01-16 21:03:53 -08:00
eaa41c5725
Merge pull request #36036 from kolyshkin/plugins
...
daemon.cleanupMetricsPlugins(): fix
Upstream-commit: 991d64eeb3ee97078a03b88185bee177c6551896
Component: engine
2018-01-17 13:54:46 +09:00
dede819b22
Merge pull request #36034 from dnephin/update-gty
...
update gotestyourself vendor
Upstream-commit: d84b8802b9fab72c0b66520e54a26c605ddee00b
Component: engine
2018-01-16 19:42:54 -08:00
a5a13dc0e0
Merge pull request #36035 from kolyshkin/gometalinter
...
gometalinter: fix --deadline option
Upstream-commit: 5488cce5d2effca1e9ae82d8d73d667cf878fd14
Component: engine
2018-01-17 12:04:01 +09:00
4a656e30d0
Improve zfs init log message for zfs
...
Signed-off-by: Drew Hubl <drew.hubl@gmail.com >
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 27b002f4a02e2d9f6eded9004b82cb81f121264f
Component: engine
2018-01-16 21:42:05 -05:00
7da3044682
Add timeouts for volume plugin ops
...
This protects the daemon from volume plugins that are slow or
deadlocked.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b15f8d2d4f054a87052a7065c50441f7e8479fa9
Component: engine
2018-01-16 20:30:49 -05:00
d8a82d08f1
daemon.cleanupMetricsPlugins(): fix
...
A linter (vet) found the following bug in the code:
> daemon/metrics.go:124::error: range variable p captured by func literal (vet)
Here a variable p is used in an async fashion by goroutine, and most
probably by the time of use it is set to the last element of a range.
For example, the following code
```go
for _, c := range []string{"here ", "we ", "go"} {
go func() {
fmt.Print(c)
}()
}
```
will print `gogogo` rather than `here we go` as one would expect.
Fixes: 0e8e8f0f31 ("Add support for metrics plugins")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 9db2c62488734a44a4f1bb9a0252c520b787acfe
Component: engine
2018-01-16 15:15:11 -08:00
374fd77d92
update gotestyourself
...
pickup changes which use t.Helper()
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4ac4b690f78a645cc50030b81077fd5319b53501
Component: engine
2018-01-16 17:43:47 -05:00
cd6c81a6fb
gometalinter: fix --deadline option
...
1. Add = between the option and the argument, otherwise the argument
appears to be passed on to the linters directly, as in:
> DEBUG: [golint.8]: executing /home/kir/go/bin/golint
> -min_confidence 0.800000 ./10m ./api ./api/errdefs <...>
2. Fix setting the default for GOMETALINTER_OPTS -- the default
was -deadline (rather than --deadline).
Fixes: b96093fa56a9 ("gometalinter: add per-platform configurable options")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: c11508a5f405084da13c35ee7ab62f1670e4da39
Component: engine
2018-01-16 14:37:11 -08:00
837b878f9d
Merge pull request #581 from thaJeztah/better-port-range-printing
...
Improve presentation of published port ranges
Upstream-commit: fab4762941
2018-01-16 17:16:45 -05:00
01a3b0d1ac
Merge pull request #812 from thaJeztah/fix-builder-quote
...
Fix stray quote in builder.md
Upstream-commit: 44094b5219
2018-01-16 23:15:18 +01:00
42cf4bc867
Fix stray quote in builder.md
...
Signed-off-by: Taylor Brown <taylorb@microsoft.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90cfa01889
2018-01-16 22:51:57 +01:00
35c47edb0e
Merge pull request #808 from ethan-haynes/698-tmpfs-mode-compose
...
added support for tmpfs-mode in compose file
Upstream-commit: 14c62f655a
2018-01-16 20:59:17 +01:00
fd6c5edde8
Merge pull request #755 from kolyshkin/wait
...
Show container wait error
Upstream-commit: 1620538c49
2018-01-16 14:40:36 -05:00
fcc2e6e315
container.waitExitOrRemoved(): add a test case
...
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 85ddaee5af
2018-01-16 10:16:28 -08:00
2c0a4f1b1f
Merge component 'engine' from git@github.com:moby/moby master
2018-01-16 17:04:06 +00:00
96cd62f939
added support for tmpfs-mode in compose file
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: cd69d082ea
2018-01-16 10:52:26 -06:00
6480a738eb
adding tmpfs field to the compose 3.6v file spec and updating binary
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: b15362ce32
2018-01-16 10:50:40 -06:00
596eb2d73f
adding config_schema_v3.6.json and updating binary
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: 2b8cc52409
2018-01-16 10:44:08 -06:00
2d002babe5
Merge component 'cli' from git@github.com:docker/cli master
2018-01-16 16:41:10 +00:00
9ec0657065
Merge pull request #810 from akimd/rmi-eol
...
Remove: add missing eol when --force is passed
Upstream-commit: 3a69e5d265
2018-01-16 10:29:46 +01:00
a9d5589889
Merge pull request #36021 from yongtang/30897-follow-up
...
Rename FindUniqueNetwork to FindNetwork
Upstream-commit: be146652108f7145e902c275807f9ef71464b031
Component: engine
2018-01-16 09:38:16 +01:00
c4ee004968
Remove: add missing eol when --force is passed
...
Signed-off-by: Akim Demaille <akim.demaille@docker.com >
Upstream-commit: f83aa7b705
2018-01-16 09:29:53 +01:00
45b9f9df5c
Merge pull request #35983 from yongtang/35980-Dockerfile.simple
...
Add required pkg-config for Dockerfile.simple
Upstream-commit: 3c7990fb63c546e0d0443e4c74a1ee15b16d005c
Component: engine
2018-01-16 02:41:36 +01:00
04ddd90677
Merge pull request #36025 from yongtang/01152018-golint
...
Fix golint error
Upstream-commit: 410e95d368cc03363472691bb2b228d3bd5c155a
Component: engine
2018-01-16 02:05:42 +01:00
69f6e83862
Fix golint error
...
PR #36011 fixed almost all of the golint issues though
there is still one golint error:
https://goreportcard.com/report/github.com/docker/docker#golint
```
Golint is a linter for Go source code.
docker/daemon/reload.go
Line 64: warning: redundant if ...; err != nil check, just return error instead. (golint)
```
This fix fixes the last one.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e02a3d9f5ba3bd9fa7f21596a6ee784bb58053f9
Component: engine
2018-01-15 21:35:30 +00:00
2802ca3c0e
Merge pull request #36018 from thaJeztah/remove-deprecated-testenv-functions
...
Remove deprecated integration-cli/environment functions
Upstream-commit: 8c31aacebff68fe73f4203f86c5681a0fce648f1
Component: engine
2018-01-15 13:24:52 -08:00
d7084e8097
Merge pull request #35638 from cpuguy83/error_helpers2
...
Add helpers to create errdef errors
Upstream-commit: c36274da8326c59aaa12c48196671b41dcb89e5b
Component: engine
2018-01-15 10:56:46 -08:00
72b954bd11
Rename FindUniqueNetwork to FindNetwork
...
This fix is a follow up to 30397, with `FindUniqueNetwork`
changed to `FindNetwork` based on the review feedback.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ccc2ed01894a1950eaf47db2ad0860ad87cd78d1
Component: engine
2018-01-15 17:34:40 +00:00
3c68801e6a
Merge component 'engine' from git@github.com:moby/moby master
2018-01-15 17:03:57 +00:00
de86612508
Merge pull request #36011 from thaJeztah/golint-fixes
...
Golint and Ineffassign fixes
Upstream-commit: a44274f1c033004f0aaaa225aa98c58c018623f6
Component: engine
2018-01-15 08:59:58 -08:00
d1c8c580ed
Remove deprecated environment.DaemonPlatform()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 18a771a761654e241ae8d1e85aa0c0a6164c5d27
Component: engine
2018-01-15 15:32:06 +01:00
28a714b165
Remove deprecated environment.MinimalBaseImage()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dfedc9ef6214500526c29fbf9a46aca9cecbeb57
Component: engine
2018-01-15 15:31:02 +01:00
d0afa0d404
Remove deprecated environment.ExperimentalDaemon()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: da8032d7d351a2073f54ec0121a796800b6b1a46
Component: engine
2018-01-15 15:30:05 +01:00
de027de052
Remove deprecated environment.DockerBasePath()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 142b1f8bfb3a1459660a5877b48f2bd7d17ba5d6
Component: engine
2018-01-15 15:29:26 +01:00
1240c39efc
Golint: don't use basic untyped string for context key
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dfac74a9e48d1562ec41bc6de194f6593f0e639b
Component: engine
2018-01-15 12:49:14 +01:00
e0f1df2210
Merge pull request #35929 from arm64b/busybox-ls-compatible
...
Upgrade the frozen images to multi-arch ones
Upstream-commit: 947eb283dc86b67ea487ed3b7c02ede7b1fbbafd
Component: engine
2018-01-15 12:28:13 +01:00
03f0380721
Merge pull request #36009 from ripcurld0/small_nitpick
...
Small nitpick: create ErrVolumeTargetIsRoot in the volume package
Upstream-commit: fb13aeef0fc9bf8762643a0682df278544e4c933
Component: engine
2018-01-15 12:19:23 +01:00
621388138c
Golint: remove redundant ifs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b4a63139696aea2c73ec361a9af8b36a118f0423
Component: engine
2018-01-15 00:42:25 +01:00
3b2e22c98e
Small nitpick: create ErrVolumeTargetIsRoot in the volume package
...
Both lcow_parser.go and linux_parser.go are duplicating the error:
"invalid specification: destination can't be '/'"
This commit creates a new error called "ErrVolumeTargetIsRoot"
that is used by both linux_parser and lcow_parser and remove
the duplication in the code.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 62143af5437a29d4b95f971d1905cfef763b0847
Component: engine
2018-01-14 11:41:39 +00:00
4ab8a85d30
Merge component 'engine' from git@github.com:moby/moby master
2018-01-13 17:03:55 +00:00
f9646377ed
Merge component 'cli' from git@github.com:docker/cli master
2018-01-13 16:41:07 +00:00
6303353f60
Merge pull request #807 from thaJeztah/golint-fixes
...
golint: remove redundant ifs
Upstream-commit: 1694921047
2018-01-13 14:55:14 +01:00
2c5689d728
ineffassign: fix unused variables
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 63a0e88e8a61b5c0d5f698d5baf37f568ee01d50
Component: engine
2018-01-13 13:35:10 +01:00
