Andrew Hsu
b089783b38
Merge pull request #76 from andrewhsu/pool
...
cherry-pick container/stream/attach: use pools.Copy
2017-06-14 11:35:08 -07:00
unclejack
eb837fd7bc
pkg/pools: add buffer32KPool & use it for copy
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
(cherry picked from commit ba40f4593f79a653f1e3a8b9597b7900fb68a564)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-14 00:20:13 +00:00
unclejack
475c218fd7
container/stream/attach: use pools.Copy
...
The use of pools.Copy avoids io.Copy's internal buffer allocation.
This commit replaces io.Copy with pools.Copy to avoid the allocation of
buffers in io.Copy.
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
(cherry picked from commit 014095e6a07748d0e1ce2f759f5c4f4b3783e765)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-14 00:20:13 +00:00
Aaron Lehmann
f2eb8b825b
Vendor swarmkit bf9b892
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-06-13 11:37:41 -07:00
Andrew Hsu
5c94f3eeda
bump VERSION files to 17.06.0-ce-rc3
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-13 07:27:03 +00:00
Andrew Hsu
5d8e13a06c
Merge pull request #71 from andrewhsu/dep-v1
...
cherry-pick: Disable legacy (v1) registries by default
2017-06-12 23:21:57 -07:00
Andrew Hsu
d611e35db6
Merge pull request #69 from andrewhsu/sk
...
revendor github.com/docker/swarmkit to ef3c57a
2017-06-12 22:03:36 -07:00
Andrew Hsu
85aaa4f261
Merge pull request #66 from mavenugo/17.06-ln
...
Vendoring libnetwork 4f5310be349d9299f6cab6d5822312f00cfa965c
2017-06-12 21:01:20 -07:00
Andrew Hsu
56ecfabb9f
Merge pull request #70 from tiborvass/revert-tty-changes
...
Revert tty changes
2017-06-12 20:53:00 -07:00
Andrew Hsu
97a704b2a7
Merge pull request #52 from seemethere/cherry_pick_33335
...
Check signal is unset before using user stopsignal
2017-06-12 19:24:57 -07:00
Andrew Hsu
a16a6004a8
revendor github.com/docker/swarmkit to 6083c76
...
To get the changes:
* https://github.com/docker/swarmkit/pull/2234
* https://github.com/docker/swarmkit/pull/2237
* https://github.com/docker/swarmkit/pull/2238
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-13 00:04:15 +00:00
Sebastiaan van Stijn
17c2a50117
Update docs, completion scripts for disable-legacy-registry
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 2b8f0eef7338f37104464154ba65aef7db3b9703)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-12 23:28:29 +00:00
Sebastiaan van Stijn
5e671f7b53
Disable legacy (v1) registries by default
...
Deprecation of interacting with v1 registries was
started in docker 1.8.3, which added a `--disable-legacy-registry`
flag.
This option was anounced to be the default starting
with docker 17.06, and v1 registries completely
removed in docker 17.12.
This patch updates the default, and disables
interaction with v1 registres by default.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 128280013f2ad90520c97b47a787be0db883e870)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-12 23:28:14 +00:00
Michael Crosby
eaac30972d
[engine] Revert ONCLR and OPOST changes
...
This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.
This also reverts the OPOST changes to the term package to support the
initial change.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
(cherry picked from commit a5e83836a49547b2add871bb52cbd8bfedb57114)
Signed-off-by: Tibor Vass <tibor@docker.com >
2017-06-12 23:27:48 +00:00
Andrew Hsu
6f00f5603d
Merge pull request #59 from seemethere/cherry_pick_33473
...
Update deprecated.md for removal of --email flag
2017-06-12 15:43:01 -07:00
Andrew Hsu
ad098a7a03
Merge pull request #64 from seemethere/cherry_pick_143
...
Remove deprecated -e/--email flag from docker login
2017-06-12 15:42:02 -07:00
Sebastiaan van Stijn
8c2c3e21a3
Remove "-e" / "--email" from integration tests
...
This option is no longer supported in docker 17.06,
so should not be used.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-06-12 10:18:49 -07:00
Andrew Hsu
da2d17a18f
Merge pull request #65 from seemethere/cherry_pick_33609
...
Merge pull request #29418 from aboch/p66
2017-06-12 09:27:42 -07:00
Madhu Venugopal
8ef3d608d9
Vendoring libnetwork 4f5310be349d9299f6cab6d5822312f00cfa965c
...
This is a cherry-pick of https://github.com/moby/moby/pull/33634
that brings in https://github.com/docker/libnetwork/pull/1796 .
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2017-06-12 09:04:36 -07:00
Andrew Hsu
514d89f021
Merge pull request #55 from andrewhsu/revendor-libnetwork-netlink
...
revendor libnetwork and netlink in engine component
2017-06-11 10:32:17 -07:00
Andrew Hsu
0189f9d259
Merge pull request #57 from seemethere/cherry_pick_33413
...
Do not reuse a http.Request after a failure in callWithRetry
2017-06-10 22:10:48 -07:00
Andrew Hsu
ca7df6fe42
Merge pull request #61 from seemethere/cherry_pick_33583
...
Logging driver should receive same file in start/stop request
2017-06-10 22:09:47 -07:00
Andrew Hsu
f7e9f2cefa
Merge pull request #58 from seemethere/cherry_pick_33363
...
Fix cancelling builder on chunked requests
2017-06-10 15:48:02 -07:00
Andrew Hsu
960ddece48
Merge pull request #62 from seemethere/cherry_pick_33598
...
daemon: Remove daemon datastructure dump functionality
2017-06-10 14:41:21 -07:00
Andrew Hsu
5a5e9e32bd
Merge pull request #63 from seemethere/cherry_pick_33606
...
Backport 17.05.0-ce changelog to master
2017-06-10 13:41:31 -07:00
Andrew Hsu
eff2539693
Merge pull request #44 from nishanttotla/cpick-cli-121
...
[cherry-pick] Enable client side digest pinning for stack deploy
2017-06-10 13:29:54 -07:00
Andrew Hsu
e92c400a01
Merge pull request #32 from nishanttotla/cpick-moby-33279-17.06
...
[cherry-pick] vendor: Ensure service images get default tag and print familiar strings
2017-06-10 13:27:49 -07:00
Andrew Hsu
4e1370233e
Merge pull request #13 from mlaventure/chp-moby-33279
...
Ensure service images get default tag and print familiar strings
2017-06-09 17:58:16 -07:00
Victor Vieux
091732e350
Merge pull request #29418 from aboch/p66
...
[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 27498a3c60018ea2880a18beec65710fd27971a7)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:38:11 -07:00
Victor Vieux
a014274b80
bump to GA
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 89658bed64c2a8fe05a978e5b87dbec409d57a0f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit d94f281d78e85f4c7de6b8347ab95d0afd5b8a8d)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:35:56 -07:00
Victor Vieux
7b65e51031
bump to rc2
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit c57fdb2a14cfba584686ddad909e3006284d10aa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b4d36e47c3501541dc66b6336e286b8c11cbcec7)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:35:34 -07:00
Aaron Lehmann
ab5798a6f7
daemon: Remove daemon datastructure dump functionality
...
When sending SIGUSR1 to the daemon, it can crash because of a concurrent
map access panic, showing a stack trace involving dumpDaemon. It appears
it's not possible to recover from a concurrent map access panic. Since
it's important that SIGUSR1 not be a destructive operation, sadly the
best course of action I can think of is to remove this functionality.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
(cherry picked from commit a4c68ee8574c9b8a3309ebebee0d90108042ba61)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:34:45 -07:00
Peter Bücker
899ed1b641
Logging driver should receive same file in start/stop request
...
Signed-off-by: Peter Bücker <peter.buecker@gmail.com >
(cherry picked from commit e908e1a357b435d7fab497d51cdd3e58458a0590)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:33:46 -07:00
Andrew Hsu
a9a1a9c7de
Merge pull request #43 from cyli/re-vendor-swarmkit
...
[17.06] Re-vendor swarmkit
2017-06-09 17:32:55 -07:00
Sebastiaan van Stijn
7950a39242
Update deprecated.md for removal of --email flag
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 43239f62bedc4721d27744d21c122622988bb3ae)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:30:43 -07:00
Tonis Tiigi
5bd868da90
Fix cancelling builder on chunked requests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 23628bd7efb0aae565cea5ee040e373b0c93fd8d)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:29:44 -07:00
Felix Abecassis
e142124317
Do not reuse a http.Request after a failure in callWithRetry
...
Closes : #33412
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com >
(cherry picked from commit 62871ef2fa52b0a2e426c30f36d35a9ba1e92fac)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-06-09 17:28:34 -07:00
Nishant Totla
0fa9fe7713
Fixing e2e test
...
Because of cherry-pick from commit
5efcec77170dd6c4087d4f1fb3695c32d94edfb4 into
components/cli/vendor/github.com/docker/docker
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2017-06-10 00:27:43 +00:00
Andrew Hsu
897b692e1c
Merge pull request #53 from seemethere/cherry_pick_33419
...
libcontainerd: fix reaper goroutine position
2017-06-09 17:21:17 -07:00
Andrew Hsu
d8fc4f1ad2
Merge pull request #54 from andrewhsu/opost
...
revert Set OPOST on bsd
2017-06-09 17:17:37 -07:00
Andrew Hsu
af4ae65a0d
Merge pull request #51 from seemethere/cherry_pick_33307
...
Event tests need to wait for events
2017-06-09 16:59:23 -07:00
Andrew Hsu
c8fa12c15c
Merge pull request #49 from seemethere/cherry_pick_33464
...
Do not log the CA config CA signing key in debug mode.
2017-06-09 15:36:06 -07:00
Andrew Hsu
36f4ffb042
Merge pull request #50 from seemethere/cherry_pick_33524
...
Fix Cache with ONBUILD
2017-06-09 15:34:01 -07:00
Andrew Hsu
0cbae9b2ee
Merge pull request #48 from seemethere/cherry_pick_33330
...
Don't create source directory while the daemon is being shutdown, fix…
2017-06-09 15:33:19 -07:00
Andrew Hsu
dcd1f685c8
Merge pull request #47 from seemethere/cherry_pick_33249
...
Add container environment variables correctly to the health check
2017-06-09 15:32:27 -07:00
Andrew Hsu
e1ebcf33f6
Merge pull request #45 from seemethere/cherry_pick_33578
...
Service alias should not be copied to task alias
2017-06-09 15:31:00 -07:00
Andrew Hsu
be7a008421
revendoring netlink in engine component
...
bumping vendor of vishvananda/netlink to bd6d5de5ccef2d66b0a26177928d0d8895d7f969
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-09 21:37:15 +00:00
Andrew Hsu
fcd821892e
revendoring libnetwork in engine component
...
bumping vendor of docker/libnetwork to 411846172fb457a6459ea94eb536f91717ee0a04
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-09 21:27:44 +00:00
Andrew Hsu
1f928815e5
Revert "Set OPOST on bsd"
...
This reverts commit fff42c853a .
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-06-09 20:55:50 +00:00
Ying
11637f7d81
Re-vendor swarmkit to include the following fixes:
...
- https://github.com/docker/swarmkit/pull/2218
- https://github.com/docker/swarmkit/pull/2215
- https://github.com/docker/swarmkit/pull/2233
Signed-off-by: Ying <ying.li@docker.com >
2017-06-09 13:25:15 -07:00