1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

1789 commits

Author SHA1 Message Date
Justin Cormack
da7a7f9b76 Merge pull request from cpuguy83/fix_apt_mirror_propagation
Propagate BUILD_APT_MIRROR and consume in buil-deb
2016-09-09 00:02:42 +01:00
Michael Crosby
4e2d442901 Merge pull request from cpuguy83/lazily_load_fixtures
Move some test fixtures to go
2016-09-08 11:16:27 -07:00
Jana Radhakrishnan
99c3968098 Vendor libnetwork @00e7660daeb4
- Fixes 
  - Fixes certain issues with workers leaving swarm and rejoining
  - Adds cluster provider interface methods to support docker run on
    overlay in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-07 15:11:48 -07:00
Brian Goff
ff91276d1f Move some test fixtures to go
moves ensure-frozen-images to go
moves ensure-syscall-test to go
moves ensure-nnp-test to go
moves ensure-httpserver to go

Also makes some of the fixtures load only for the required tests.
This makes sure that fixtures that won't be needed for a test run such as
`make TESTFLAGS='-check.f Swarm' test-integration-cli` (for example)
aren't loaded... like the syscall tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-07 17:30:35 -04:00
Jana Radhakrishnan
39143ef15d Vendor swarmkit @27fbaef4ceed6
Adds a new task runtime to support network attachmemt for plain old
docker containers so that they can participate multi-host networks and
get access to services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-07 11:52:49 -07:00
Brian Goff
f672a963c9 Propagate BUILD_APT_MIRROR and consume in buil-deb
Passses down BUILD_APT_MIRROR to the docker env.
Ensures BUILD_APT_MIRROR is used when building debs, but only when the
consuming `Dockerfile` actually uses it, otherwise it will cause the
build to fail (e.g. on Ubuntu builds we aren't using APT_MIRROR).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-07 10:57:00 -04:00
Vincent Demeester
a0bbf54aa7 Merge pull request from cpuguy83/verify_integration_tests
Fail faster if integration tests don't compile
2016-09-07 16:48:14 +02:00
Brian Goff
4d0275c819 Verify integration tests before building bundles
Adds a new bundle `verify-integration-tests` which pre-compiles a test
binary for the integration tests.

This makes sure that the integration tests will actually compile before
doing other tasks which take much longer, such as building dockerd and
loading test fixtures.
When it comes time to actually run the tests, the pre-compiled binary
will be used so it doesn't have to compile the tests a 2nd time.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-06 20:27:28 -04:00
unclejack
9fbe0f2156 Merge pull request from bamarni/raspbian-overlay
remove systemd drop-in unit on raspbian
2016-09-05 04:45:47 -07:00
Vincent Demeester
c73fae2352 Merge pull request from tonistiigi/govet17
Fix govet for go1.7
2016-09-03 19:27:19 +02:00
Tonis Tiigi
7a8c7b47cf Fix govet for go1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-09-02 19:07:54 -07:00
Bilal Amarni
de078211b3 Remove systemd drop-in file on raspbian
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605).

The default storage driver would now be devicemapper, until the
deb package is updated.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-09-01 23:18:05 +02:00
Justin Cormack
8ccac1ad4d Merge pull request from runcom/engine-api-vendor
vendor docker/engine-api@f9cef59044
2016-09-01 10:51:34 +01:00
Antonio Murdaca
8f7a8c75ae
vendor docker/engine-api@f9cef59044
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-31 22:39:13 +02:00
Michael Crosby
a9e513867c Output docker-py test results in xunit format
This adds a `results.xml` to the test-docker-py output folder.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-31 09:35:49 -07:00
Fabio Rapposelli
6c7e1863d5
Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2016-08-30 17:05:32 -07:00
Vincent Demeester
92da332638 Merge pull request from allencloud/modify-vendor-script
better vendor.sh to break when fail in grep
2016-08-30 11:26:41 +02:00
allencloud
e06a8dc6be better vendor.sh to break when fail in grep
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-26 23:42:21 +08:00
Victor Vieux
63a19edcb1 add -f to plugin inspect
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 22:40:05 -07:00
Tibor Vass
ed0dff8f16 Merge pull request from vieux/enabled
replace active by enabled for consistency in plugins
2016-08-26 15:22:41 -07:00
boucher
e0123adafd Upgrade containerd to latest version.
Necessary for merging in .

Signed-off-by: Ross Boucher <rboucher@gmail.com>
2016-08-26 14:17:35 -04:00
Victor Vieux
cf4e268115 replace active by enabled for consistency in plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 20:42:49 -07:00
Daniel Nephin
25587906d1 Merge pull request from dnephin/remove-mflag-from-dockerd
Convert docker and dockerd commands to spf13/cobra
2016-08-25 17:19:19 -04:00
Justin Cormack
f243bfbc9d All supported Go versions have -cover now
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-25 18:24:35 +01:00
Daniel Nephin
ac40179e8a Update spf13/cobra vendor to v1.4.1
Support command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-25 13:09:03 -04:00
Justin Cormack
eda90f6344 Remove gccgo support
Since Go 1.7, s390x uses upstream Go, so we have no reason to
support gccgo any more.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-24 11:09:35 +01:00
Tonis Tiigi
ee030251f2 vendor: update swarmkit in 8a761950f
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-22 11:36:06 -07:00
Sven Dowideit
e168f0b4ad Merge pull request from decoursin/patch-1
Update apparmor error message
2016-08-22 15:47:23 +10:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-21 19:04:15 +02:00
Sebastiaan van Stijn
d6c75c3138 Merge pull request from vdemeester/25313-integration-no-cover
Disable coverage on test-integration-cli
2016-08-19 14:31:24 +02:00
Nick DeCoursin
ae4ad3d955 Update apparmor error message
Signed-off-by: decoursin <n.decoursin@foodpanda.com>
2016-08-19 14:22:27 +02:00
Brian Goff
09e1de2080 Merge pull request from darrenstahlmsft/RevendorHcsshim
Vendor hcsshim to v0.4.2
2016-08-18 17:21:02 -04:00
Vincent Demeester
5ec6e11e15
Disable coverage on test-integration-cli
Temporarly remove cover bundle from defaults.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-18 22:12:24 +02:00
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 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 

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 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 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 from mrjana/vendor
Vendoring libnetwork @82fb373e3eaa4e
2016-08-16 08:01:16 -07:00
Vincent Demeester
72a312c07b Merge pull request 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 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 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 from dperny/rate-limit-swarm-pull-log
Rate limit logspam during docker service pulls
2016-08-12 13:06:39 -04:00