23b4fdf3bc
removing TODO, and explain why we can't filter by id on the matchevent method.
...
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
Upstream-commit: be9aa09246534a1fdf7c08cf287dbe1e6de375c9
Component: engine
2017-07-07 23:32:37 +02:00
c70c1ec6df
Merge pull request #33341 from cyli/do-not-clear-state-on-swarm-init-join
...
Do not clear swarm directory on `swarm init` and `swarm join`
Upstream-commit: a9fcaee3514c60d997044b246e4c06e9ba80f4f5
Component: engine
2017-05-23 12:09:53 -07:00
7c3373349d
Merge pull request #33342 from aaronlehmann/cred-helpers-vendor
...
vendor: Remove docker-credential-helpers
Upstream-commit: b3d19cfc6a0184feb814734716fa2fda415f4623
Component: engine
2017-05-22 21:08:16 -04:00
90e101ed15
Do not clear swarm directory at the begining of swarm init and swarm join now.
...
However, do clear the directory if init or join fails, because we don't
want to leave it in a half-finished state.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: bf3e9293a66c77a2fddf4e691222898846b4af9f
Component: engine
2017-05-22 17:45:20 -07:00
949950950a
vendor: Remove docker-credential-helpers
...
This appears to be a remnant from the CLI that is no longer imported
anywhere. Remove it from vendor.conf and the vendor directory.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: aa6fc939baf0bae00391a0ba703187018055b8bf
Component: engine
2017-05-22 13:58:28 -07:00
d64468f256
Merge pull request #33279 from nishanttotla/fix-service-image-issues
...
Ensure service images get default tag and print familiar strings
Upstream-commit: 5648a1ada223d692615072af26d0ce6e23415006
Component: engine
2017-05-22 21:45:11 +01:00
7813ee64ef
Merge pull request #33310 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.4.1
Upstream-commit: 65f360fc415a5ef648250a76ca261c2ae529467a
Component: engine
2017-05-22 10:31:57 -07:00
3dea3b7a46
Merge pull request #32774 from darrenstahlmsft/ProcessorMaximum
...
Use CpuMaximum instead of CpuPercent for more precision
Upstream-commit: bb64d45be1dce3fe1a526b2362a7d8451bfdcbe3
Component: engine
2017-05-22 08:55:17 -07:00
45dcc1512b
Merge pull request #33253 from dave-tucker/clientHost
...
client: Expose ClientHost to client users
Upstream-commit: ab2abb0d940476fcb56d2ee565afdf1bc4d525d4
Component: engine
2017-05-22 16:27:43 +01:00
4a211248b9
client: Expose DaemonHost to client users
...
This commit exposes `Client.host` as `Client.DaemonHost()`
This allows users of the client, a CLI for example, to query the Host
that the client is attempting to contact and vary their behaviour
accordingly. For example, to allow client-side configuration of
HTTP proxy settings for a number of different docker hosts.
Signed-off-by: Dave Tucker <dt@docker.com >
Upstream-commit: 6ce6ae1cd11d888e0c8ede20926b86981cee5ce1
Component: engine
2017-05-22 13:25:11 +01:00
52f875b0b8
Merge pull request #33307 from dongluochen/swarm_event_test
...
Event tests need retry logic
Upstream-commit: 916e9ad75472bb5a0ab7acf9515a4d369248791d
Component: engine
2017-05-20 15:48:50 +02:00
cb8736d49e
Merge pull request #33308 from ehazlett/remove-runtime-data
...
Remove RuntimeData from cluster and types
Upstream-commit: a40595d498f6e2c58ae539e130d81d00143b0a76
Component: engine
2017-05-20 02:05:06 +02:00
bce5af578c
Revendor go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: af7d8d09ef2dde07c9c0004a14e3a28c93007458
Component: engine
2017-05-19 16:13:52 -07:00
c9ec562bee
remove RuntimeData from cluster and types
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 8eeba751983d6499a07fcd21c26f381eb1d17d19
Component: engine
2017-05-19 17:10:32 -04:00
f1ce9152c0
Use CpuMaximum instead of CpuPercent for more precision
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 425973cbb87aef6a32b225a57f5ef2d78d5749d5
Component: engine
2017-05-19 12:33:14 -07:00
1f14cbbc58
Revendor runtime-spec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: b90f294c1cf0dd2bc3f139cd8f339da79595a0bb
Component: engine
2017-05-19 12:33:14 -07:00
caad7b9331
Event tests need to wait for events
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 59b2d0473af5155bb31adcc17bc36857ebd13a15
Component: engine
2017-05-19 12:14:50 -07:00
ddd4203548
Merge pull request #33261 from aaronlehmann/empty-platform
...
api: Only return a Platform when relevant information is available
Upstream-commit: f888a25ff5bc9bb7c95400ec19b9a5fa0d738bab
Component: engine
2017-05-19 20:05:07 +02:00
8d6081fcd1
Adding unit tests for pin by digest (client)
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 75c7536d2e2e328b644bf69153de879d1d197988
Component: engine
2017-05-19 10:48:12 -07:00
93bcab0aa8
Ensure service images get default tag and print familiar strings
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 5efcec77170dd6c4087d4f1fb3695c32d94edfb4
Component: engine
2017-05-19 10:35:34 -07:00
756d246384
Merge pull request #33299 from thaJeztah/explain-relation-between-paused-and-stopped
...
Improve description of Running and Paused booleans
Upstream-commit: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff
Component: engine
2017-05-19 16:29:05 +02:00
1dc2936c51
Merge pull request #33293 from fd/patch-1
...
Remove deadlock in ContainerWait
Upstream-commit: d98d4faef86c4ba4470c7f28c2ce92c10de4a565
Component: engine
2017-05-19 16:17:54 +02:00
b0a3ababea
Merge pull request #33286 from aboch/ingr
...
Properly identify ingress network created with older swarm
Upstream-commit: 39a604c0d419424bab0314e7070c49bcacca3bda
Component: engine
2017-05-19 10:04:29 -04:00
845a39e447
Merge pull request #33296 from vdemeester/more-opts-cleanup
...
Remove more opts unused in docker/docker
Upstream-commit: d8e85f8c60929e0bc1313983f5007ad92f8adf29
Component: engine
2017-05-19 10:01:34 -04:00
cd659b1f37
Merge pull request #33291 from YuPengZTE/devFilter
...
arg filter for printf verb %s of wrong type
Upstream-commit: a3536d2c6d5df6e2280366edebe6d240dc757111
Component: engine
2017-05-19 12:33:33 +02:00
4bffda81c9
Improve description of Running and Paused booleans
...
Commit abd72d4008dde7ee8249170d49eb4bc963c51e24 added
a "FIXME" comment to the container "State", mentioning
that a container cannot be both "Running" and "Paused".
This comment was incorrect, because containers on
Linux actually _must_ be running in order to be
paused.
This patch adds additional information both in a
comment, and in the API documentation to clarify
that these booleans are not mutually exclusive.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b654b6244d6d63a0758029488a95feb446e089bd
Component: engine
2017-05-19 12:29:54 +02:00
64383889f3
Remove more opts unused in docker/docker
...
These are already present in `docker/cli` 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61e527f16ccbbbca137c4db1b13b558ee4a51213
Component: engine
2017-05-19 12:05:51 +02:00
87298d4be7
Remove deadlock in ContainerWait
...
when `cli.post(...)` fails `errC <- err` blocks because `errC` is unbufferd.
Signed-off-by: Simon Menke <simon.menke@gmail.com >
Upstream-commit: 4d2d2ea39336aade783c5c415b83d129bdd339bb
Component: engine
2017-05-19 09:23:52 +02:00
1e0f9dbab8
arg filt
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 49bf533fe72fd2390da89d133fbe984d0284ebe2
Component: engine
2017-05-19 13:47:32 +08:00
fc392f988e
Merge pull request #33280 from mavenugo/vin-ln-1706
...
Vendoring libnetwork b2bc1a684
Upstream-commit: ab83b924bc5dde5c2ac81b0befe5e370f3acb7e3
Component: engine
2017-05-18 23:31:23 -04:00
ba221c0328
Properly identify ingress network created with older swarm
...
- otherwise docker network prune will remove it
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 93763f11eeec5e9b1d0308a3ad85bbf069f9107f
Component: engine
2017-05-18 19:47:45 -07:00
01eae47819
Merge pull request #33281 from dmcgowan/overlay2-on-btrfs
...
Support overlay2 on btrfs
Upstream-commit: 01af41ed99f96693bd04bec1cf0f7a6b97bc2408
Component: engine
2017-05-19 03:09:39 +02:00
200114130e
Merge pull request #33278 from tonistiigi/plugin-chroot
...
Use chrootarchive for plugin rootfs
Upstream-commit: 6c05ceeb0b483f15b4b7b449db6c3f32a5e30d6b
Component: engine
2017-05-19 02:38:29 +02:00
a41009bb07
Merge pull request #33269 from tophj-ibm/switch-more-syscalls-pkg-term
...
[pkg/term] switch more syscalls to /x/sys/
Upstream-commit: dd27bbb41a7f98a0beea3d7f39da0dbb53e29ff5
Component: engine
2017-05-19 02:37:52 +02:00
10c5371927
Support overlay2 on btrfs
...
OverlayFS is supported on top of btrfs as of Linux Kernel 4.7.
Skip the hard enforcement when on kernel 4.7 or newer and
respect the kernel check override flag on older kernels.
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: f64a4ad008e68996afcec3ab34a869887716f944
Component: engine
2017-05-18 15:26:03 -07:00
f6ecbd87c6
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
2d8e76dfbc
Merge pull request #33274 from aaronlehmann/update-cli
...
Update CLI commit hash
Upstream-commit: da9a8854834cb48a8112d8192811d9c41f8be358
Component: engine
2017-05-18 15:11:10 -07:00
14bb0faf0c
Use chrootarchive for plugin rootfs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6f3f907cdba0ba1aa4eb1320595d155bab3467af
Component: engine
2017-05-18 14:53:46 -07:00
0d783a82c9
Merge pull request #33267 from YuPengZTE/devImageWithDigestString
...
ineffectual assignment to isCanonical, delete it, and make the "if" sentence to fit the golang usage
Upstream-commit: b0dd3dfc1184b210854b62c231b7b074dd6dbd26
Component: engine
2017-05-18 23:37:52 +02:00
6b7f9e397d
Merge pull request #33250 from cyphar/apparmor-readonly-root-fix
...
apparmor: make pkg/aaparser work on read-only root
Upstream-commit: 6b262572028cc249b7da8cc55459197395fdb33e
Component: engine
2017-05-18 23:17:31 +02:00
b7e3ae2808
Merge pull request #33264 from wenjianhn/chkp-ls
...
Fix checkpoint ls
Upstream-commit: cc24049f77eb94ad486bd22c2470f0d13d6158a1
Component: engine
2017-05-18 13:37:42 -07:00
fa959621f1
Merge pull request #33271 from masahide/fix-append-loop-awslogs
...
Improved poor memory efficiency of awslogs
Upstream-commit: 7061b0f748c29ffd1e6852cdc5dd11f90840eb1c
Component: engine
2017-05-18 21:29:17 +02:00
d490134960
Update CLI commit hash
...
Since this new version of the CLI resolves image digests for swarm
services by default, and we do not want integration tests to talk to
Docker Hub, update CLI tests to suppress this behavior.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: d012569b78c27e6e52bc5006d9a1d7a2099b1c2b
Component: engine
2017-05-18 12:23:28 -07:00
17712f857a
Improved poor memory efficiency of awslogs
...
Signed-off-by: YAMASAKI Masahide <masahide.y@gmail.com >
Upstream-commit: 524f30634018ce619da61aa0a13dad245e098226
Component: engine
2017-05-18 23:30:00 +09:00
f074fcfdd0
[pkg/term] switch more syscalls to /x/sys/
...
Switches the remaining syscalls except Errno to /x/sys/.
This was supposed to be part of 33180
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: df6dfcf198a769e7f411736e1abb93e1aabb2698
Component: engine
2017-05-18 09:02:42 -04:00
4b438a3414
Merge pull request #33116 from dnephin/refactor-builder-copy
...
[Builder] Refactor COPY/ADD dispatchers
Upstream-commit: 23e857cd3de399b8894442d49efdc83570995fe4
Component: engine
2017-05-18 14:18:14 +02:00
a8771c2674
ineffectual assignment to isCanonical, delete it
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: b28c1eae01e73fb92fe46f60a1bbd4e4f5a223b1
Component: engine
2017-05-18 17:16:19 +08:00
94f743d6a5
Merge pull request #33130 from abhinandanpb/network-opt
...
Adding network specific options to service create/update
Upstream-commit: 45c6f4262a865a03adaac291a9ce33c0f2190d77
Component: engine
2017-05-17 21:03:06 -07:00
a65ff11d52
Fix checkpoint ls
...
Use create=false when calling getCheckpointDir
Fix #33263
Signed-off-by: Jacob Wen <jian.w.wen@oracle.com >
Upstream-commit: c0d2ec1eb585a31e3d7734aef7acb753644c49c0
Component: engine
2017-05-18 10:57:10 +08:00
fa9d85bebb
Merge pull request #33239 from nishanttotla/add-platform-information-service-spec
...
Adding compatible platforms to service spec
Upstream-commit: 4874e05f7452d7d9c60db50296d04c802ce76ae1
Component: engine
2017-05-17 19:31:24 -07:00
