Commit Graph

1815 Commits

Author SHA1 Message Date
f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
ada47b1174 Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8f4afb86eeb7f3f4a26eec51e4b843e1714f9f46
Component: engine
2016-09-26 23:48:16 -07:00
8a1347213b Bump remaining Dockerfile go versions to 1.7.1
These weren't updated with the switch to go1.7.1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
c7b9575ce1 Revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
This commit revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
to improve error message for removing pre-defined (e.g., `ingress`) network.

This commit is related to 24538.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f4e94617f087fc19614858fe496314673ad3877d
Component: engine
2016-09-24 12:14:04 -07:00
9b9def0b18 Vendoring libnetwork @bf3d9ccfb8e
Fixes certain node management issues when a daemon is restarted or fails
or leaves and joins a swarm.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: cd20621201d48f76b856d7d2404ee182e41e3492
Component: engine
2016-09-23 16:06:38 -07:00
1778a3ba1e Vendoring libnetwork @6caf9022fa09
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 746113d5840d064843a3d0b4c2cd68459b1d9415
Component: engine
2016-09-22 21:00:32 -07:00
956358039b Vendoring dependencies
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: 522930cfb3a9786d6c730e92068ea5b2656cabb0
Component: engine
2016-09-22 12:21:28 -07:00
6b6c0bf977 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
2016-09-22 09:39:27 +02:00
38db9ff302 Merge pull request #26770 from YuPengZTE/devEG
'eg.' should be 'e.g.'
Upstream-commit: a7b0b6e2a9360115e9bca719f6bdb6e9d8fc3415
Component: engine
2016-09-21 10:03:23 -04:00
7c1d86c305 Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
2016-09-21 12:36:52 +02:00
de0192fa30 'eg.' should be 'e.g.'
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5
Component: engine
2016-09-21 13:48:06 +08:00
fe82ab0481 Merge pull request #26538 from LK4D4/update_grpc
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
53ebd11aff vendor: update containerd and swarmkit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: eeceb0ccc8318ecbf577147363666b959959450e
Component: engine
2016-09-20 09:24:36 -07:00
19f0411692 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>
Upstream-commit: 87124b9d62bc71f7632126cf7f8d5eb805c4a7f1
Component: engine
2016-09-20 20:31:22 +09:00
8ee0f56810 Add init process for zombie fighting
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
2016-09-19 17:33:50 -07:00
fe6c7fd94a re-vendor syslog package
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f528690674712b680caf2712092c7e2f8f236491
Component: engine
2016-09-17 10:25:05 -04:00
17ba48af4f Merge pull request #26583 from aboch/vnd
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
2016-09-15 20:28:07 -07:00
8e66a0ffda vendor: update grpc and protobuf
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: afe23cea3d73fc4c5f90ff109edbddd339ea29ed
Component: engine
2016-09-15 11:36:31 -07:00
a320cdf50c Vendoring boltdb @fff57c100
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5cfbdceafe87df8bab85c0561a1483d3191eb775
Component: engine
2016-09-15 10:53:48 -07:00
30accdf3a6 Vendoring libnetwork @c8ce8c7
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 161c12142594d602ed46ef7601a57e3761d52f99
Component: engine
2016-09-14 14:46:05 -07:00
99577ad8e2 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
63c413223c Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
7e3f0fe810 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
6bdcfc529e Vendor libnetwork @51d88e9ae63f
- Fixes #26440

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 7d8048de06d6074dc83c973a48c1e1a1b60704b6
Component: engine
2016-09-09 18:57:15 +02:00
820ac3028c Update containerd to fix unkillable restored containers.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 6bc9a2d563ace9fa604de15731e263b353e83120
Component: engine
2016-09-08 21:31:56 -04:00
b896a9dba6 Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6866fda800ab9adb9a88b60f6660b512401c921f
Component: engine
2016-09-08 18:26:50 -07:00
e2b900a8b1 Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
Propagate BUILD_APT_MIRROR and consume in buil-deb
Upstream-commit: da7a7f9b769f6c1ccc88526390a3ff6528e31eb9
Component: engine
2016-09-09 00:02:42 +01:00
fbcd483854 Merge pull request #26119 from cpuguy83/lazily_load_fixtures
Move some test fixtures to go
Upstream-commit: 4e2d4429013ff4f6ca100063869b27b247f7da34
Component: engine
2016-09-08 11:16:27 -07:00
690d211fb6 Vendor libnetwork @00e7660daeb4
- Fixes #25325
  - 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>
Upstream-commit: 99c39680984018b345881a29d77a89f87958a57b
Component: engine
2016-09-07 15:11:48 -07:00
cecd3ec1b9 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>
Upstream-commit: ff91276d1f5beab5582d9ca582ee01af13198333
Component: engine
2016-09-07 17:30:35 -04:00
97719e4178 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>
Upstream-commit: 39143ef15d6b95acc37f209c8ba5ebc4b3d57c79
Component: engine
2016-09-07 11:52:49 -07:00
2a13e97eec 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>
Upstream-commit: f672a963c9f1225daec9d2d12577f95936dee51e
Component: engine
2016-09-07 10:57:00 -04:00
01c442fe23 Merge pull request #26275 from cpuguy83/verify_integration_tests
Fail faster if integration tests don't compile
Upstream-commit: a0bbf54aa70b590fab33c916ad77573a62d69bf9
Component: engine
2016-09-07 16:48:14 +02:00
b03700a5d5 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>
Upstream-commit: 4d0275c8192ca39d88f7dbe1e59ec03b544b6696
Component: engine
2016-09-06 20:27:28 -04:00
a4d0659867 Merge pull request #26199 from bamarni/raspbian-overlay
remove systemd drop-in unit on raspbian
Upstream-commit: 9fbe0f21565e9ef41393d5f211e9a7e5a51d0adc
Component: engine
2016-09-05 04:45:47 -07:00
637e45cd56 Merge pull request #26290 from tonistiigi/govet17
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
2016-09-03 19:27:19 +02:00
833a33ebb8 Fix govet for go1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
2016-09-02 19:07:54 -07:00
9d1a7feea8 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>
Upstream-commit: de078211b30e13825b596ff4b2798e0fb780551a
Component: engine
2016-09-01 23:18:05 +02:00
a03ebc79ee Merge pull request #26200 from runcom/engine-api-vendor
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
2016-09-01 10:51:34 +01:00
1965814a4e vendor docker/engine-api@f9cef59044
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
2016-08-31 22:39:13 +02:00
abf975f617 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>
Upstream-commit: a9e513867cd9eb327ae56877886ed18a5ad5b691
Component: engine
2016-08-31 09:35:49 -07:00
cc7e4cafad Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
4cd762346d Merge pull request #25521 from allencloud/modify-vendor-script
better vendor.sh to break when fail in grep
Upstream-commit: 92da332638597cf424090b16a90435ea4601891a
Component: engine
2016-08-30 11:26:41 +02:00
575d72a5b0 better vendor.sh to break when fail in grep
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: e06a8dc6be448082bc642675799e6f170d34d6d7
Component: engine
2016-08-26 23:42:21 +08:00
e357d485dd add -f to plugin inspect
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 63a19edcb18b1bc650cc1d6eed78c2c3b376be62
Component: engine
2016-08-25 22:40:05 -07:00
67ccfbdecc Merge pull request #25424 from vieux/enabled
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
2016-08-26 15:22:41 -07:00
0ef65cbad6 Upgrade containerd to latest version.
Necessary for merging in #22049.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
Upstream-commit: e0123adafdc1e6a14a1dac10c5371da11b6fc063
Component: engine
2016-08-26 14:17:35 -04:00
e44f33953e replace active by enabled for consistency in plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
2016-08-25 20:42:49 -07:00
de17e6a998 Merge pull request #25354 from dnephin/remove-mflag-from-dockerd
Convert docker and dockerd commands to spf13/cobra
Upstream-commit: 25587906d122c4fce0eb1fbd3dfb805914455f59
Component: engine
2016-08-25 17:19:19 -04:00
49618f0083 All supported Go versions have -cover now
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: f243bfbc9d3879be33946d92801cc0f3e7290b17
Component: engine
2016-08-25 18:24:35 +01:00