Commit graph

2806 commits

Author SHA1 Message Date
Darren Stahl
ba54581c3d Vendor hcsshim to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-18 12:53:01 -07:00
Anusha Ragunathan
764d97444e Vendor distribution changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-18 09:30:31 -07:00
Brian Goff
d8e12f8755 Merge pull request #25809 from justincormack/patricia
Update go-patricia to 2.2.6
2016-08-17 15:25:17 -04:00
Justin Cormack
d16f96262e Update go-patricia to 2.2.6
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 19:02:32 +01:00
Michael Crosby
041e5a21dc Replace old oci specs import with runtime-specs
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
5e2a519957 Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim
Revendor hcsshim to v0.4.1
2016-08-17 10:50:00 +02:00
Darren Stahl
c58d0358c3 Revendor hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-16 17:28:49 -07:00
Brian Goff
37302bbb3f Merge pull request #25721 from cpuguy83/revendor_engine-api
revendor engine-api
2016-08-16 17:18:43 -04:00
Brian Goff
6d98e344c7 revendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-16 14:16:12 -04:00
Alexander Morozov
6f06afab2a Merge pull request #25739 from mrjana/vendor
Vendoring libnetwork @82fb373e3eaa4e
2016-08-16 08:01:16 -07:00
Vincent Demeester
72a312c07b Merge pull request #25684 from d64/improve-systemd-config-for-raspbian
Improve systemd configuration for Raspbian/Jessie
2016-08-16 10:58:33 +02:00
John Howard
3c6f4cd5a6 Merge pull request #25143 from cpuguy83/update_go-check
Add stack dumps from the daemon(s) on test timeout
2016-08-15 22:09:20 -07:00
Jana Radhakrishnan
56c9822695 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>
2016-08-15 17:53:35 -07:00
Dieter Reuter
3c7ae431e0 Improve systemd config for Raspbian
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-08-13 16:29:06 +02:00
Tibor Vass
e1c7ad871f release-rpm: fix bad destination paths for rpms
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 16:51:12 -07:00
Tõnis Tiigi
f4646196b6 Merge pull request #25668 from LK4D4/remove_rewrite
hack/vendor.sh: remove old hacks for etcd
2016-08-12 10:12:50 -07:00
Brian Goff
b0431d63dc Merge pull request #25635 from dperny/rate-limit-swarm-pull-log
Rate limit logspam during docker service pulls
2016-08-12 13:06:39 -04:00
Alexander Morozov
6623a5342c hack/vendor.sh: remove old hacks for etcd
etcd uses standard vendoring now

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-12 08:50:52 -07:00
Vincent Demeester
4f20721c9a Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd
Vendor new swarmkit and etcd/raft
2016-08-12 11:10:58 +02:00
Santhosh Manohar
b9c9fa2855 Vendoring libnetwork for 1.12.1-rc1
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-08-11 18:44:32 -07:00
Aaron Lehmann
be48cfc8eb Vendor new swarmkit and etcd/raft.
This brings in a much newer version of etcd/raft.

An unrelated change in swarmkit should fix some problems with
integration tests on ARM.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-11 18:35:21 -07:00
Drew Erny
fa0054a3eb Rate limit logspam during docker service pulls
During image pulls on docker service create, logs will only show status
updates and updates every 1 second on long-running actions like
downloading and extracting. Adds golang.org/x/time/rate as dependency.

Ports docker/swarmkit#1352 to docker/docker.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-08-11 14:56:38 -07:00
Tibor Vass
7758ced594 Merge pull request #25591 from tiborvass/fix-release-script
Make release scripts architecture-agnostic and add ARM support
2016-08-11 11:27:19 -07:00
Tibor Vass
2ff2e9a730 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>
2016-08-11 11:18:52 -07:00
Madhu Venugopal
6645ff8ac1 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>
2016-08-11 00:12:43 -07:00
Tonis Tiigi
3b555a575d vendor: update swarmkit to cb6d8131
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-10 13:27:38 -07:00
Tibor Vass
fc40ed24d8 Merge pull request #25334 from crosbymichael/selinux-fedora
Add selinux policy per distro/version
2016-08-10 11:40:33 -07:00
Tibor Vass
a6aea68c35 Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie
Add support to install Docker on raspbian/jessie
2016-08-10 11:06:04 -07:00
Brian Goff
51771a3094 re-vendor go-check
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-09 09:27:58 -04:00
unclejack
34877a41a8 Merge pull request #25510 from justincormack/patricia-2.2.5
Update go-patricia to 2.2.5
2016-08-09 01:06:53 -07:00
Justin Cormack
b2b41b2194 Merge pull request #25502 from LK4D4/update_gorilla
vendor: use tags for gorilla projects
2016-08-08 23:28:15 +01:00
Justin Cormack
e4402b285b Update go-patricia to 2.2.5
Fixes an issue that showed up on gccgo.

Fix #25360

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-08 22:28:41 +01:00
Alexander Morozov
98530ac8e2 vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-08 11:58:32 -07:00
allencloud
fc63bb83ca update go-units vendor to newest version
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 00:10:19 +08:00
Daniel Nephin
8a81986a58 Merge pull request #24948 from dnephin/support-iterative-integration-testing
Support running integration tests without restarting a daemon
2016-08-05 14:23:24 -04:00
Alexander Morozov
430a234a5b Merge pull request #24434 from AkihiroSuda/fixMakeInstall
make install: install runc and containerd
2016-08-05 09:34:21 -07:00
Daniel Nephin
1d945a9743 Support interactive integration testing.
Interactive integration testing is useful when you're developing new tests, or
making changes to cli code.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-05 12:07:28 -04:00
Vincent Demeester
85428a1a53 Merge pull request #25096 from vieux/docker_plugin_remove_force
Add --force to docker plugin remove
2016-08-05 14:45:05 +02:00
Victor Vieux
0016b331da Add --force to docker plugin remove
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-04 15:55:45 -07:00
Michael Crosby
32b1f26c51 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
4a6ce94da5

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-04 14:29:22 -07:00
Sebastiaan van Stijn
153c946b79 deb: skip hidden files when generating indexes
We don't need hidden files to be listed
in the indexes, so skip them if hidden
files exist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 12:58:14 +02:00
Diogo Monica
a327c231b5 Add --force to node removal
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-08-01 18:55:58 -07:00
unclejack
3d714b5ed5 vendor.sh: bump go-patricia to 2.2.4 to fix leaks
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-08-01 12:21:19 +03:00
Justin Cormack
a846fa7ac9 Merge pull request #24835 from justincormack/armextlink
Do not default to external linking on arm, i386
2016-07-29 00:57:56 +01:00
Madhu Venugopal
61e59693dc Vendoring libnetwork to avoid a deadlock
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fa)
2016-07-28 15:12:45 -07:00
Tibor Vass
58d0d5b6b5 Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master
Remove join-tokens from the /info API
2016-07-28 11:08:50 -07:00
Sebastiaan van Stijn
8a8a63aa32 Merge pull request #25137 from justincormack/32bit-seccomp-test
Add a test that the default seccomp profile allows execution of 32 bit binaries
2016-07-28 17:01:04 +02:00
Aaron Lehmann
96b2a6e548 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>
(cherry picked from commit d8f3b3f006)
2016-07-27 18:11:51 -07:00
Justin Cormack
93bbc76ee5 Add a test that the default seccomp profile allows execution of 32 bit binaries
While testing #24510 I noticed that 32 bit syscalls were incorrectly being
blocked and we did not have a test for this, so adding one.

This is only tested on amd64 as it is the only architecture that
reliably supports 32 bit code execution, others only do sometimes.

There is no 32 bit libc in the buildpack-deps so we cannot build
32 bit C code easily so use the simplest assembly program which
just calls the exit syscall.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-27 18:42:34 +01:00
Madhu Venugopal
b1ae883d3f Vendoring libnetwork to fix #25109
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-27 08:41:46 -07:00