Satoshi Tagomori
659509e40b
Update fluent-logger-golang to v1.2.1
...
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).
Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
(cherry picked from commit 53ed17449e
2016-10-20 11:36:10 -07:00
Aaron Lehmann
109b53d882
Vendor swarmkit for 1.12.3
...
This updates swarmkit to include a few important bug fixes, including
some fixes for regressions.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-19 10:23:27 -07:00
Tibor Vass
026f385aa3
install: fix debian stretch
...
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 047264763a
2016-10-06 14:24:36 -07:00
Kenfe-Mickael Laventure
3377b4b9b7
Update containerd and runc
...
containerd: 0366d7e9693c930cf18c0f50cc16acec064e96c5
runc: 02f8fa7863dd3f82909a73e2061897828460d52f
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-06 09:28:08 -07:00
Alessandro Boch
cb58783630
Vendoring libnetwork & swarmkit to address #27147
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-05 21:16:04 -07:00
Victor Vieux
545d909aac
Merge pull request #27079 from vieux/cherry-picks-and-changelog-1.12.2
...
Cherry-picks and Changelog 1.12.2-rc2
2016-10-03 22:34:24 -07:00
Madhu Venugopal
d11648696f
Vendoring libnetwork 9fc9609b
...
Cherry-picking fix for #27109
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-10-03 12:09:45 -07:00
Kenfe-Mickael Laventure
5d04e28d9e
Remove amd64 assumption in release.sh, cross and tgz scripts
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 61335bcb03
2016-10-01 02:47:49 -07:00
Alexander Morozov
d29db3a55a
vendor: update swarmkit for 1.12.2
...
This includes:
docker/swarmkit#1588
docker/swarmkit#1592
docker/swarmkit#1594
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-30 14:18:45 -07:00
Victor Vieux
1ec9ca1ca6
Merge pull request #26866 from docker/cherry-picks-1.12.2
...
Cherry picks 1.12.2
2016-09-27 13:33:29 -07:00
Madhu Venugopal
2d183336ec
Vendor libnetwork#1473
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-09-27 09:23:59 -07:00
Satoshi Tagomori
32b0633f65
Update fluent-logger-golang to v1.2.0.
...
Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference".
This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes.
Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
(cherry picked from commit 87124b9d62
2016-09-26 19:35:31 -07:00
Brian Goff
a1d191d91e
re-vendor syslog package
...
Fixes #26394
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f528690674
2016-09-26 19:34:59 -07:00
Alessandro Boch
2be91b121b
Vendoring boltdb @fff57c100
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 5cfbdceafe
2016-09-26 19:34:04 -07:00
Victor Vieux
667c02ce8c
Merge pull request #26765 from aaronlehmann/swarmkit-1.12.2
...
Vendor SwarmKit for 1.12.2
2016-09-26 13:05:52 -07:00
Kenfe-Mickael Laventure
727402135d
Vendor in containerd
...
This brings in the exec's children handling fixes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-25 05:23:22 -07:00
Madhu Venugopal
0ce34bdb12
Vendoring libnetwork e282a91b294ab413a172b3c4e37d15fa92d79ef5
...
Carries a bunch of patches to resolve routing-mesh and swarm-mode
networking issues.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-09-23 17:26:40 -07:00
Aaron Lehmann
33e855f8ae
Vendor swarmkit for 1.12.2
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-09-23 09:58:27 -07:00
Sven Dowideit
7e956837f2
Merge pull request #25835 from decoursin/patch-1
...
Update apparmor error message
(cherry picked from commit e168f0b4ad
2016-08-26 16:06:10 -07:00
Tibor Vass
a544fe4b38
Vendor swarmkit to change root key to P-256
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Jana Radhakrishnan
651c53f020
Vendoring libnetwork @82fb373e3eaa4e
...
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
- Fixes an issue with SRV query forwarding in DNS
- Fixes a map race
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 56c9822695
2016-08-16 15:37:43 -07:00
Dieter Reuter
64f62a6703
Improve systemd config for Raspbian
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 3c7ae431e0
2016-08-16 15:37:43 -07:00
Tibor Vass
460d8d80ca
release-rpm: fix bad destination paths for rpms
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e1c7ad871f
2016-08-16 15:37:43 -07:00
Santhosh Manohar
42fed93a89
Vendoring libnetwork for 1.12.1-rc1
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit b9c9fa2855
2016-08-11 20:26:04 -07:00
Tibor Vass
dab3fc3955
Make release scripts architecture-agnostic and add ARM support
...
This patch allows to only release the packages that were built and are
present under the bundles/ directory instead of assuming packages exist
for all distros enumerated in the contrib/builder/ directory.
It also now adds support for armhf architecture for apt repositories.
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 2ff2e9a730
2016-08-11 17:56:51 -07:00
Madhu Venugopal
46afae5372
Vendoring libnetwork for 1.12.1-rc1
...
* Fixes https://github.com/docker/docker/issues/25236
* Fixes https://github.com/docker/docker/issues/24789
* Fixes https://github.com/docker/docker/issues/25340
* Fixes https://github.com/docker/docker/issues/25130
* Fixes https://github.com/docker/libnetwork/issues/1387
* Fix external DNS responses > 512 bytes getting dropped
* Fix crash when remote plugin returns empty address string
* Make service LB work from self
* Fixed a few race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 6645ff8ac1
2016-08-11 17:56:50 -07:00
Michael Crosby
2f6ca79080
Add selinux policy per distro
...
This adds the ability to have different profiles for individual distros
and versions of the distro because they all ship with and depend on
different versions of policy packages.
The `selinux` dir contains the unmodified policy that is being used
today. The `selinux-fedora` dir contains the new policy for fedora 24
with the changes for it to compile and work on the system.
The fedora policy is from commit
4a6ce94da532b1f26c51
2016-08-11 17:56:50 -07:00
Dieter Reuter
147f1ad348
Fix typo in comment
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 430bf992d9
2016-08-11 17:56:49 -07:00
Dieter Reuter
dff3faf04e
Add a Raspbian specific systemd unit file, use overlay by default
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 84ff895a06
2016-08-11 17:56:49 -07:00
Dieter Reuter
25a629574c
Add support to install Docker on raspbian/jessie
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 6e76b7a7e5
2016-08-11 17:56:49 -07:00
Tibor Vass
bdc0a24156
Vendor engine-api and swarmkit for 1.12.1
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 17:56:30 -07:00
Madhu Venugopal
4f369a74fa
Vendoring libnetwork to avoid a deadlock
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-28 12:02:09 -07:00
Madhu Venugopal
29f6886e48
Vendoring libnetwork to fix #25109
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit b1ae883d3f
2016-07-27 14:55:30 -07:00
Aaron Lehmann
d8f3b3f006
Remove join-tokens from the /info API
...
join-tokens are not needed for this endpoint, and should not be as part
of /info
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-27 12:10:49 -07:00
Daniel Nephin
5b667c7c55
Require manpages for packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 1ea9c19ffe
2016-07-26 14:43:35 +02:00
Daniel Nephin
c5531b033a
Make manpages in a conatiner.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7004f219f5
2016-07-26 14:43:11 +02:00
Tibor Vass
0ffa19daa8
vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e3c150bd47
2016-07-26 04:37:31 -07:00
Madhu Venugopal
fe1d39cc96
Vendoring libnetwork to remove stale xfrm states
...
When using encrypted vxlan network, some of the xfrm states are left
stale. This fix also filters out self advertise-addr rules.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 6a754a4eef
2016-07-26 03:51:44 -07:00
Aaron Lehmann
4b986851f7
Vendor swarmkit for 1.12.0-rc5
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 60496af711
2016-07-26 01:52:07 -07:00
Aaron Lehmann
92cbdfece9
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 3585026c3a
2016-07-25 23:24:37 -07:00
Madhu Venugopal
c6ff464d43
Vendoring libnetwork for rc5
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 56b78ab2f2
2016-07-25 23:18:15 -07:00
Aaron Lehmann
38beb3d9ab
Vendor libnetwork and github.com/vishvananda/netlink
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 24d2d53f5d
2016-07-25 23:17:35 -07:00
Aaron Lehmann
ea9d74b755
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d626875a94
2016-07-25 23:17:34 -07:00
Sebastiaan van Stijn
723073bccb
bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9a3e47511a
2016-07-25 23:17:34 -07:00
Aaron Lehmann
b738f3f3e5
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit aaa0f0b246
2016-07-25 23:17:00 -07:00
Aaron Lehmann
05b1803b13
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 852091ad41
2016-07-25 23:17:00 -07:00
Alexandre Beslic
51b749e659
update libkv, fix wrong error check on zookeeper list
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
(cherry picked from commit 5189e3d50d
2016-07-25 23:16:16 -07:00
Yong Tang
9ce976f4f6
Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1
...
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.
This is part of step to fix #24270 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 467107cd40
2016-07-25 23:15:45 -07:00
Kenfe-Mickael Laventure
6c717a5744
Vendor in new containerd
...
This version introduces the following:
- uses nanosecond timestamps for event
- ensure events are sent once their effect is "live"
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 29b2714580
2016-07-25 23:15:42 -07:00
Daniel Nephin
0649299908
Dont run man generation as part of test-unit.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 47cca88c8c
2016-07-25 23:15:42 -07:00
