0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29769 commits 14 branches 412 tags 338 MiB
Commit graph

1974 commits

Author SHA1 Message Date
Amit Krishnan
16db092af2 Uprev google/certificate-transparency to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-10-25 13:14:57 -07:00
Alexander Morozov
36f47aa252 Merge pull request #27519 from justincormack/proxy-build 
Build docker-proxy from git checkout like other external binaries
 2016-10-25 08:54:13 -07:00
Justin Cormack
1c6f5b5fff Add shell completions to tgz 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-25 13:43:55 +01:00
Justin Cormack
3996975b08 Build docker-proxy from git checkout like other external binaries 
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-25 13:13:22 +01:00
Sebastiaan van Stijn
ba41a5edac Merge pull request #27223 from mlaventure/merge-experimental 
Make experimental a runtime flag
 2016-10-24 16:58:32 -07:00
Kenfe-Mickael Laventure
7781a1bf0f Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-24 15:20:01 -07:00
Vincent Demeester
67b85f9d26 Merge pull request #26354 from KingEmet/fixbranch 
make GetAll use client.List as the source of truth
 2016-10-24 14:25:24 -07:00
Sebastiaan van Stijn
3c385b9f6b Merge pull request #27117 from dnephin/swagger-gen 
Add swagger.yaml and generate a few types from the spec
 2016-10-21 18:15:28 -07:00
Sebastiaan van Stijn
32b541e443 Merge pull request #27405 from tonistiigi/fix-fifo2 
Fix issues with fifos blocking on open
 2016-10-21 09:44:33 -07:00
allencloud
3cff9e0267 revendor go-units to update more accurate time display 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-21 11:05:11 +08:00
Tonis Tiigi
6d26464502 Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-20 17:02:02 -07:00
Aaron Lehmann
12a4ed0317 Vendor swarmkit in master 
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-20 13:49:22 -07:00
Aaron Lehmann
2c620d0aa2 Merge pull request #27287 from mavenugo/pluginv2-sk2 
Allow multiple handlers to support network plugins in swarm-mode
 2016-10-20 13:43:04 -07:00
Daniel Nephin
4bfa2e634c Exclude generated types from linting. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Daniel Nephin
6f7b69b63f Generate plugin types from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Daniel Nephin
02e1ffd76c Add whitespace and create a script to run generation 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Vincent Demeester
13fd75c3dd Merge pull request #27470 from runcom/expose-exec-pid 
record pid of exec'd process
 2016-10-20 21:36:21 +02:00
Michael Crosby
ffa0446e8b Merge pull request #27556 from LK4D4/unify_install 
project: unify way of installing runc and containerd
 2016-10-20 10:13:40 -07:00
Alexander Morozov
179479c6cd project: unify way of installing runc and containerd 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-20 08:50:02 -07:00
Antonio Murdaca
1808348136
record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-20 17:06:11 +02:00
Vincent Demeester
a4125e2265 Merge pull request #27514 from crosbymichael/update-init-oct18 
Update docker-init to 74341e923bdf06cfb6b70cf54089
 2016-10-20 16:58:26 +02:00
Tõnis Tiigi
9f30c28d21 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors 
Fix problems with wrapped errors in logrus
 2016-10-19 10:16:01 -07:00
Daniel Nephin
4e4da146ec Update sfp13/pflag 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-18 17:17:22 -07:00
Aaron Lehmann
738131faae Fix problems with wrapped errors in logrus 
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:

- When printing to a terminal (colors enabled), stack traces are
  included in the error fields on a log line.

- When printing to a file (or with colors disabled), the error value is
  missing entirely.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-18 17:14:59 -07:00
Michael Crosby
3c3ba4cb66 Update docker-init to 74341e923bdf06cfb6b70cf54089 
Fixes a bug with background processes after the child process exits.

diff:
74341e923b

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-10-18 14:45:43 -07:00
Alexander Morozov
329f272fd5 Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts 
Update fluent-logger-golang to v1.2.1
 2016-10-18 12:47:13 -07:00
Carlos Alexandro Becker
2ce76c0696
cleaning up more stuff in vendor 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
 2016-10-18 09:20:41 -02:00
Sebastiaan van Stijn
24582e8153 Merge pull request #27471 from caarlos0/logentries 
Added Logentries Driver
 2016-10-18 01:33:28 -07:00
Satoshi Tagomori
53ed17449e Update fluent-logger-golang to v1.2.1 
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
 2016-10-18 11:26:32 +09:00
Carlos Alexandro Becker
0f4db1cc59
Added logentries dependency to vendor 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
 2016-10-17 22:06:39 -02:00
Madhu Venugopal
88cae7412d Vendoring Swarmkit 1fed8d2a2ccd2a9b6d6fb864d4ad3461fc6dc3eb 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-10-15 08:49:55 -07:00
cyli
5f4dcd8252 Bump vendored and dockerfile notary version to v0.4.2 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-10-14 17:52:56 -07:00
Jana Radhakrishnan
9ae9f9812b Vendoring libnetwork @04025f2a2eebb 
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-10-14 11:12:24 -07:00
Tibor Vass
8658748ef7 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz 
Make authz use pluginv2
 2016-10-13 00:28:43 +02:00
Anusha Ragunathan
1845f506e4 Vendor libnetwork. 
This is primarily for plugingetter import path change.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-10-11 13:09:01 -07:00
Tianon Gravi
8d6e9f0c6a Merge pull request #27005 from lizzha/azurechina 
Use the mirror in China for Azure China environment
 2016-10-11 13:04:11 -07:00
Madhu Venugopal
5ff17cb4aa Merge pull request #26954 from mrjana/net 
Vendoring libnetwork @7b74403
 2016-10-11 05:59:35 -07:00
Liz Zhang
451979a368 Use the mirror in China for Azure China environment 
Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Use the mirror in China for Azure China environment

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update option name to --mirror

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update indent and change variable name

Signed-off-by: Liz Zhang <lizzha@microsoft.com>
 2016-10-11 17:27:18 +08:00
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
Jana Radhakrishnan
83ba14a552 Vendoring libnetwork @7b74403be424 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-10-10 14:39:02 -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
Jake Sanders
b264632904 make GetAll use client.List as the source of truth 
Signed-off-by: Jake Sanders <jsand@google.com>
 2016-09-23 11:48:15 -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
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 #26275 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 #26199 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 #26290 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 #26200 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 #25521 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 #25424 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 #22049.

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 #25354 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 #25835 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 #25799 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 #25843 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 #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