cdca524947
Merge pull request #25799 from vdemeester/25313-integration-no-cover
...
Disable coverage on test-integration-cli
Upstream-commit: d6c75c31387cd144d4bd08c9bc3191ade16ad8ea
Component: engine
2016-08-19 14:31:24 +02:00
cd9d633b0a
Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim
...
Vendor hcsshim to v0.4.2
Upstream-commit: 09e1de2080fd3b0bafb38adbd4b8c12ee949794d
Component: engine
2016-08-18 17:21:02 -04:00
75edb24b6f
Disable coverage on test-integration-cli
...
Temporarly remove cover bundle from defaults.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5ec6e11e157b94d56bc2d7aa8e94cf7e72f51871
Component: engine
2016-08-18 22:12:24 +02:00
c7c2901b56
Vendor hcsshim to v0.4.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ba54581c3d4e388586100c53ee705eaac3c2201c
Component: engine
2016-08-18 12:53:01 -07:00
389d0f753e
Vendor distribution changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 764d97444eb1ff41207a99b291346819ad1f51cd
Component: engine
2016-08-18 09:30:31 -07:00
f3a1d45b88
Merge pull request #25809 from justincormack/patricia
...
Update go-patricia to 2.2.6
Upstream-commit: d8e12f87559ae21327820b3cd5abb0249ab47519
Component: engine
2016-08-17 15:25:17 -04:00
891863d8ab
Update go-patricia to 2.2.6
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d16f96262e25487f84d6217bf4c224280a84d89f
Component: engine
2016-08-17 19:02:32 +01:00
6c683fac48
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 >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
6964d60fa7
Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim
...
Revendor hcsshim to v0.4.1
Upstream-commit: 5e2a5199570169934fb80819356e5afb8bc6e8c1
Component: engine
2016-08-17 10:50:00 +02:00
97adc78725
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
2016-08-16 17:28:49 -07:00
a0933c7d27
Merge pull request #25721 from cpuguy83/revendor_engine-api
...
revendor engine-api
Upstream-commit: 37302bbb3f4889e9de2a95d5ea018acdab9e4447
Component: engine
2016-08-16 17:18:43 -04:00
3dcc0abf19
revendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6d98e344c7702a8a713cb9e02a19d83a79d3f930
Component: engine
2016-08-16 14:16:12 -04:00
a7130a656e
Merge pull request #25739 from mrjana/vendor
...
Vendoring libnetwork @82fb373e3eaa4e
Upstream-commit: 6f06afab2a37924be5b9ee5712847062b2037337
Component: engine
2016-08-16 08:01:16 -07:00
900e8ce606
Merge pull request #25684 from d64/improve-systemd-config-for-raspbian
...
Improve systemd configuration for Raspbian/Jessie
Upstream-commit: 72a312c07b101941254f6d2f128520612e42b301
Component: engine
2016-08-16 10:58:33 +02:00
a3a8b4ee81
Merge pull request #25143 from cpuguy83/update_go-check
...
Add stack dumps from the daemon(s) on test timeout
Upstream-commit: 3c6f4cd5a6c0de3d3700ad14bb8f177e8e1198fd
Component: engine
2016-08-15 22:09:20 -07:00
607f7b2a80
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 >
Upstream-commit: 56c98226955d98a2ba6a99bffd3a9a80d691e4a7
Component: engine
2016-08-15 17:53:35 -07:00
dd0ee03026
Improve systemd config for Raspbian
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 3c7ae431e08af7a53ebfe4fbb2eaf279fb3993b6
Component: engine
2016-08-13 16:29:06 +02:00
a8ef6a6a87
release-rpm: fix bad destination paths for rpms
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e1c7ad871f6fd41a7682cf7effb02838ab679ae3
Component: engine
2016-08-12 16:51:12 -07:00
894d8b6245
Merge pull request #25668 from LK4D4/remove_rewrite
...
hack/vendor.sh: remove old hacks for etcd
Upstream-commit: f4646196b6694cd4662a366906377c2fd5c73fde
Component: engine
2016-08-12 10:12:50 -07:00
e8a6674a00
Merge pull request #25635 from dperny/rate-limit-swarm-pull-log
...
Rate limit logspam during docker service pulls
Upstream-commit: b0431d63dca1573d66624dd67230bf0d9c8ef623
Component: engine
2016-08-12 13:06:39 -04:00
6b6387c135
hack/vendor.sh: remove old hacks for etcd
...
etcd uses standard vendoring now
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6623a5342c7b982ebc630974490eac06792d0605
Component: engine
2016-08-12 08:50:52 -07:00
d24087f666
Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd
...
Vendor new swarmkit and etcd/raft
Upstream-commit: 4f20721c9aefeec819a42e9a8e6f7a21e76c1534
Component: engine
2016-08-12 11:10:58 +02:00
46db5e3595
Vendoring libnetwork for 1.12.1-rc1
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: b9c9fa2855cd5c7391cd026ef13a7d9d061214ee
Component: engine
2016-08-11 18:44:32 -07:00
cb6631c865
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 >
Upstream-commit: be48cfc8eb2f517563991b007c261fed58301fd1
Component: engine
2016-08-11 18:35:21 -07:00
95f97c43df
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 >
Upstream-commit: fa0054a3eb0363526d34fb4ac912cab30044f3d7
Component: engine
2016-08-11 14:56:38 -07:00
915e5e6f9f
Merge pull request #25591 from tiborvass/fix-release-script
...
Make release scripts architecture-agnostic and add ARM support
Upstream-commit: 7758ced59427a41d2205bc26cbd4596c71a47072
Component: engine
2016-08-11 11:27:19 -07:00
6221e2aa8d
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 >
Upstream-commit: 2ff2e9a73076b737948c68c26f26b7bda5ac7db8
Component: engine
2016-08-11 11:18:52 -07:00
a67684d015
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 >
Upstream-commit: 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924
Component: engine
2016-08-11 00:12:43 -07:00
0130526e07
vendor: update swarmkit to cb6d8131
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
2016-08-10 13:27:38 -07:00
874b6f9cd1
Merge pull request #25334 from crosbymichael/selinux-fedora
...
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
2016-08-10 11:40:33 -07:00
b3651d506c
Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie
...
Add support to install Docker on raspbian/jessie
Upstream-commit: a6aea68c35a6d0c27d2c299aaeff6aecd9a451e8
Component: engine
2016-08-10 11:06:04 -07:00
2e4e3536cc
re-vendor go-check
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 51771a3094a09e0302d7149fd9b1c196a7fc4021
Component: engine
2016-08-09 09:27:58 -04:00
835bbac65d
Merge pull request #25510 from justincormack/patricia-2.2.5
...
Update go-patricia to 2.2.5
Upstream-commit: 34877a41a8a6660a31ff3770566cc1341759b16c
Component: engine
2016-08-09 01:06:53 -07:00
936c3ba707
Merge pull request #25502 from LK4D4/update_gorilla
...
vendor: use tags for gorilla projects
Upstream-commit: b2b41b2194a95c9f8b878b2a97706032fbf54c38
Component: engine
2016-08-08 23:28:15 +01:00
21ddd17186
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 >
Upstream-commit: e4402b285ba0a764ea1cffc1487c92b05b59a0ea
Component: engine
2016-08-08 22:28:41 +01:00
fc0f559a6c
vendor: use tags for gorilla projects
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 98530ac8e2b0e1003f4d8346c5b1445b281d4f9c
Component: engine
2016-08-08 11:58:32 -07:00
b5cfc0f922
update go-units vendor to newest version
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
2016-08-09 00:10:19 +08:00
293fa410c5
Merge pull request #24948 from dnephin/support-iterative-integration-testing
...
Support running integration tests without restarting a daemon
Upstream-commit: 8a81986a583a9e1a146931373608fbff378d09a2
Component: engine
2016-08-05 14:23:24 -04:00
8e64c9c8ad
Merge pull request #24434 from AkihiroSuda/fixMakeInstall
...
make install: install runc and containerd
Upstream-commit: 430a234a5b0b664f3f047f83ef0b843ee7ebb3cf
Component: engine
2016-08-05 09:34:21 -07:00
aa2e0abc3e
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 >
Upstream-commit: 1d945a9743748373cd5c5bfface3209d241007d7
Component: engine
2016-08-05 12:07:28 -04:00
fb8eea7ff0
Merge pull request #25096 from vieux/docker_plugin_remove_force
...
Add --force to docker plugin remove
Upstream-commit: 85428a1a53292684be55de9de3646e8c4745c72e
Component: engine
2016-08-05 14:45:05 +02:00
d5f439ee89
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
2016-08-04 15:55:45 -07:00
fa68c3585a
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
4a6ce94da5crosbymichael@gmail.com >
Upstream-commit: 32b1f26c5111b22fe4277879c4f5e4687a6a72fc
Component: engine
2016-08-04 14:29:22 -07:00
765a0eacba
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 >
Upstream-commit: 153c946b7923fda4d60ad735f2f9e02ffb150704
Component: engine
2016-08-03 12:58:14 +02:00
0e5400a423
Add --force to node removal
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com >
Upstream-commit: a327c231b5c68c13b7dcde2fdc83b8e4cec59c43
Component: engine
2016-08-01 18:55:58 -07:00
3da2c0af7c
vendor.sh: bump go-patricia to 2.2.4 to fix leaks
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3d714b5ed58cfdfd5872ddd3654d171b09bb02d3
Component: engine
2016-08-01 12:21:19 +03:00
fd99a88e88
Merge pull request #24835 from justincormack/armextlink
...
Do not default to external linking on arm, i386
Upstream-commit: a846fa7ac9ab85f8a2798ef299f88324047ec8c9
Component: engine
2016-07-29 00:57:56 +01:00
f9dff992a9
Vendoring libnetwork to avoid a deadlock
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
2016-07-28 15:12:45 -07:00
333de2a679
Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master
...
Remove join-tokens from the /info API
Upstream-commit: 58d0d5b6b5cc048bf5b59f69862182e55526f91e
Component: engine
2016-07-28 11:08:50 -07:00
a2827e4f47
Merge pull request #25137 from justincormack/32bit-seccomp-test
...
Add a test that the default seccomp profile allows execution of 32 bit binaries
Upstream-commit: 8a8a63aa32a60e12b3c4d8e9e3397a8bd3b96d54
Component: engine
2016-07-28 17:01:04 +02:00
