Andrew Hsu
6646fc318f
Revert "change dep for docker-selinux in centos-7+"
...
This reverts commit c80d82a98d
2016-12-15 16:30:14 -08:00
Andrew Hsu
1606fe0c04
Revert "only build selinux rpm if we have policy dir"
...
This reverts commit f9bc32067d
2016-12-15 16:29:58 -08:00
Victor Vieux
5fb9e4926a
Merge pull request #29377 from andrewhsu/require-docker-selinux
...
[1.12.x] depend on docker-selinux for centos-7.3+
2016-12-13 22:25:21 -08:00
Andrew Hsu
f9bc32067d
only build selinux rpm if we have policy dir
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-13 17:01:48 -08:00
Andrew Hsu
c80d82a98d
change dep for docker-selinux in centos-7+
...
Use the policy files provided by CentOS for docker by depending on
docker-selinux.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-13 17:01:48 -08:00
Derek McGowan
a3cadca8e5
Use sha512 when gpg signing builds
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-12-09 17:57:23 -08:00
Dieter Reuter
7679e0bdfc
Include distro name into .deb filename
...
Right now we do have a problem to store the .debs for raspbian-jessie and
debian-jessie distro version for armhf arch. Both .debs have the same filename
so we have to include the distro version, too.
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-12-09 17:57:19 -08:00
Victor Vieux
dbbcc8f549
Merge pull request #29141 from mlaventure/1.12.x-containerd-fifo
...
[1.12.x] Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e
2016-12-07 13:31:17 -08:00
Vincent Demeester
f966aae6ae
Merge pull request #29150 from vieux/cherry_28026
...
[1.12.x] a few cherry-picks
2016-12-06 10:17:23 +01:00
Antonio Murdaca
e2b0adeb5c
hack/make.sh: fix BUILDTIME
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 7b1f77dcbc
2016-12-05 16:34:02 -08:00
Brian Goff
4da9f49339
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 00caf03132
2016-12-05 14:24:39 -08:00
Alessandro Boch
f54df35bc0
[1.12.x] Porting libnetwork patch
...
- Honor ICC setting for internal network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-12-05 13:06:30 -08:00
Kenfe-Mickael Laventure
b01949b19a
Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e
...
This adds the use of tonistiigi/fifo
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-05 09:53:18 -08:00
Tonis Tiigi
06092267aa
vendor: update fifo to fe870ccf2
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-02 18:10:16 -08:00
Tonis Tiigi
6781d1912d
Fix issues with fifos blocking on open
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6d26464502
2016-12-02 18:08:57 -08:00
Victor Vieux
f25e197379
Merge pull request #29004 from aboch/c1.12.x
...
[1.12.x] Porting libnetwork fixes
2016-12-02 16:28:26 -08:00
Aaron Lehmann
020915ca30
Vendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-01 16:39:14 -08:00
Alessandro Boch
d619f3d669
Porting libnetwork fixes to 1.12.x
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-30 14:40:39 -08:00
Victor Vieux
190a96131c
Merge pull request #27634 from justincormack/user-cap-test
...
Test that non root user cannot use default capabilities
2016-10-24 01:26:02 -07:00
Justin Cormack
5c0c9e4587
Test that non root user cannot use default capabilities
...
Test for #27590
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-22 12:18:43 +01:00
Victor Vieux
d1a1b9692a
Merge pull request #27595 from vieux/cherry-picks-1.12.3
...
cherry-picks 1.12.3
2016-10-21 16:59:01 -07:00
Michael Crosby
d60a3418d0
Bump runc to f59ba3cdd76fdc08c004f42aa915996f6f420899
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-10-21 12:49:30 -07:00
Victor Vieux
8bc5f43b14
Merge pull request #27559 from aboch/c1.12.x
...
Vendoring libnetwork for 1.12.3
2016-10-20 12:06:27 -07:00
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
Alessandro Boch
882e8d5d75
Vendoring libnetwork for 1.12.3
...
- It includes few fixes which prevent a
deadlock, a panic, a couple of races,
and a regression.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-19 13:01:50 -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
