Commit graph

1834 commits

Author SHA1 Message Date
John Howard
97ac469934 Windows: Update go-winio to 0.3.5
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-10 15:08:17 -07:00
Michael Crosby
c27116575e Update grimes to 15ecf9414859b16a8a19ac6748a622a5498d57e3
This fixes an issue when wait4 returns a 0 return status causing the
reaping loop to continue to run.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-10-07 12:06:42 -07:00
Victor Vieux
2fd674a00f Merge pull request #27184 from tiborvass/gnupg-debian-stretch
install: fix debian stretch
2016-10-06 14:20:03 -07:00
Tibor Vass
047264763a 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>
2016-10-06 22:23:08 +02:00
Justin Cormack
5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
2016-10-06 19:36:31 +02:00
Kenfe-Mickael Laventure
7e12c3bb99 Update containerd and runc
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-05 14:47:15 -07:00
Darren Stahl
267c04aa36 Revendor hcsshim to v0.5.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-05 14:40:51 -07:00
Alexander Morozov
921a0bf686 Merge pull request #26932 from dmcgowan/update-tar-split
Update tar split
2016-10-05 13:45:07 -07:00
Michael Crosby
0b86ca9ad0 Merge pull request #26509 from LK4D4/commits_from_vendor
project: move go binaries installation to separate script
2016-10-05 13:15:30 -07:00
Michael Crosby
214b70e6ef Merge pull request #27038 from jstarks/non_base_utilityvm
Windows: support Windows servicing layers
2016-10-05 10:02:31 -07:00
Anusha Ragunathan
0cc7f0185f Merge pull request #26860 from anusha-ragunathan/nw-pv2
Make libnetwork use pluginv2.
2016-10-03 17:12:16 -07:00
Kenfe-Mickael Laventure
61335bcb03 Remove amd64 assumption in release.sh, cross and tgz scripts
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-03 15:46:42 -07:00
John Starks
cab70c391f Windows: Revendor hcsshim v0.4.5
This update adds support for non-base layers that have utility VM updates
and hard links. This is necessary to support Microsoft-released layers
with servicing updates.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-10-03 11:00:04 -07:00
Anusha Ragunathan
009f741351 Vendor docker/swarmkit changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:59:38 -07:00
Anusha Ragunathan
2b0f0d0d71 Vendor in docker/libnetwork.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:40:05 -07:00
Michael Crosby
97660c6ec5 Merge pull request #26961 from Microsoft/jjh/oci
Windows: OCI runtime spec compliance
2016-09-30 10:13:57 -07:00
Vincent Demeester
b0e1b8fc79 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
2016-09-28 11:50:27 +02:00
John Howard
ba2df17493 Revendor OCI runtime-spec 1c7c27d043c2
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-27 12:05:47 -07:00
Derek McGowan
e338217770
Update tar split
Pulls in fix for tar split disassembly incorrectly storing the padding
at the end of the file, leading to a hash difference on the
re-assembled tar archive.

Closes #26434

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-09-27 09:57:56 -07:00
Yong Tang
8f4afb86ee Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-26 23:48:16 -07:00
Christopher Jones
f431211631
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>
2016-09-26 12:13:39 -04:00
Yong Tang
f4e94617f0 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>
2016-09-24 12:14:04 -07:00
Jana Radhakrishnan
cd20621201 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>
2016-09-23 16:06:38 -07:00
Alexander Morozov
1b41125ad9 project: move go binaries installation to separate script
It should allow easier updates for containerd and runc

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-23 09:21:29 -07:00
Jana Radhakrishnan
746113d584 Vendoring libnetwork @6caf9022fa09
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-22 21:00:32 -07:00
msabansal
522930cfb3 Vendoring dependencies
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-09-22 12:21:28 -07:00
Vincent Demeester
d9aec43a16 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
Remove engine-api leftovers
2016-09-22 09:39:27 +02:00
Brian Goff
a7b0b6e2a9 Merge pull request #26770 from YuPengZTE/devEG
'eg.' should be 'e.g.'
2016-09-21 10:03:23 -04:00
Sebastiaan van Stijn
45818d6fc4
Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
YuPengZTE
0b86bca0b5 'eg.' should be 'e.g.'
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-21 13:48:06 +08:00
Vincent Demeester
758a809f54 Merge pull request #26538 from LK4D4/update_grpc
Update grpc to v1.0.1-GA
2016-09-20 23:19:26 +02:00
Alexander Morozov
eeceb0ccc8 vendor: update containerd and swarmkit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-20 09:24:36 -07:00
Satoshi Tagomori
87124b9d62 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>
2016-09-20 20:31:22 +09:00
Michael Crosby
ee3ac3aa66 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>
2016-09-19 17:33:50 -07:00
Brian Goff
f528690674 re-vendor syslog package
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-17 10:25:05 -04:00
Tõnis Tiigi
4adbd5338d Merge pull request #26583 from aboch/vnd
Vendoring libnetwork @c8ce8c7
2016-09-15 20:28:07 -07:00
Alexander Morozov
afe23cea3d vendor: update grpc and protobuf
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-15 11:36:31 -07:00
Alessandro Boch
5cfbdceafe Vendoring boltdb @fff57c100
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-15 10:53:48 -07:00
Alessandro Boch
161c121425 Vendoring libnetwork @c8ce8c7
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-14 14:46:05 -07:00
Alexander Morozov
e4ddcb37c1 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-12 14:22:38 -07:00
Madhu Venugopal
130db0a489 Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
Vendor libnetwork @51d88e9ae63f
2016-09-10 06:00:32 -07:00
Vincent Demeester
4c3f2e7c37 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
Restrict size to 2 fractional digits for `docker images`
2016-09-10 11:32:45 +02:00
root
7d8048de06 Vendor libnetwork @51d88e9ae63f
- Fixes #26440

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-09 18:57:15 +02:00
boucher
6bc9a2d563 Update containerd to fix unkillable restored containers.
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:56 -04:00
Yong Tang
6866fda800 Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-08 18:26:50 -07:00
Justin Cormack
da7a7f9b76 Merge pull request #26375 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 #26119 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 #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>
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