Commit graph

1723 commits

Author SHA1 Message Date
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
Alexander Morozov
98530ac8e2 vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-08 11:58:32 -07:00
allencloud
fc63bb83ca update go-units vendor to newest version
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 00:10:19 +08:00
Daniel Nephin
8a81986a58 Merge pull request #24948 from dnephin/support-iterative-integration-testing
Support running integration tests without restarting a daemon
2016-08-05 14:23:24 -04:00
Alexander Morozov
430a234a5b Merge pull request #24434 from AkihiroSuda/fixMakeInstall
make install: install runc and containerd
2016-08-05 09:34:21 -07:00
Daniel Nephin
1d945a9743 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>
2016-08-05 12:07:28 -04:00
Vincent Demeester
85428a1a53 Merge pull request #25096 from vieux/docker_plugin_remove_force
Add --force to docker plugin remove
2016-08-05 14:45:05 +02:00
Victor Vieux
0016b331da Add --force to docker plugin remove
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-04 15:55:45 -07:00
Sebastiaan van Stijn
153c946b79 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>
2016-08-03 12:58:14 +02:00
Diogo Monica
a327c231b5 Add --force to node removal
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-08-01 18:55:58 -07:00
unclejack
3d714b5ed5 vendor.sh: bump go-patricia to 2.2.4 to fix leaks
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-08-01 12:21:19 +03:00
Justin Cormack
a846fa7ac9 Merge pull request #24835 from justincormack/armextlink
Do not default to external linking on arm, i386
2016-07-29 00:57:56 +01:00
Madhu Venugopal
61e59693dc Vendoring libnetwork to avoid a deadlock
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fa)
2016-07-28 15:12:45 -07:00
Tibor Vass
58d0d5b6b5 Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master
Remove join-tokens from the /info API
2016-07-28 11:08:50 -07:00
Sebastiaan van Stijn
8a8a63aa32 Merge pull request #25137 from justincormack/32bit-seccomp-test
Add a test that the default seccomp profile allows execution of 32 bit binaries
2016-07-28 17:01:04 +02:00
Aaron Lehmann
96b2a6e548 Remove join-tokens from the /info API
join-tokens are not needed for this endpoint, and should not be as part
of /info

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d8f3b3f006)
2016-07-27 18:11:51 -07:00
Justin Cormack
93bbc76ee5 Add a test that the default seccomp profile allows execution of 32 bit binaries
While testing #24510 I noticed that 32 bit syscalls were incorrectly being
blocked and we did not have a test for this, so adding one.

This is only tested on amd64 as it is the only architecture that
reliably supports 32 bit code execution, others only do sometimes.

There is no 32 bit libc in the buildpack-deps so we cannot build
32 bit C code easily so use the simplest assembly program which
just calls the exit syscall.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-27 18:42:34 +01:00
Madhu Venugopal
b1ae883d3f Vendoring libnetwork to fix #25109
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-27 08:41:46 -07:00
Sebastiaan van Stijn
1e83886dd5 Merge pull request #24950 from dnephin/make-manpages-in-container
Make manpages in a container when creating deb/rpm
2016-07-26 14:34:14 +02:00
Tibor Vass
9fc2eee2b5 Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5
Vendor swarmkit for 1.12.0-rc5
2016-07-26 01:47:34 -07:00
Tibor Vass
9ee430fcf5 Merge pull request #25042 from tiborvass/carry-24492
Carry 24492: Remove swarm inspect and use info instead
2016-07-26 01:11:37 -07:00
Aaron Lehmann
60496af711 Vendor swarmkit for 1.12.0-rc5
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-26 00:45:07 -07:00
Tibor Vass
e3c150bd47 vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 20:31:10 -07:00
Madhu Venugopal
6a754a4eef Vendoring libnetwork to remove stale xfrm states
When using encrypted vxlan network, some of the xfrm states are left
stale. This fix also filters out self advertise-addr rules.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-25 19:44:07 -07:00
Tibor Vass
c65925f24b Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Madhu Venugopal
56b78ab2f2 Vendoring libnetwork for rc5
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-24 20:08:00 -07:00
Aaron Lehmann
3585026c3a Revendor engine-api
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 11:13:13 -07:00
Aaron Lehmann
24d2d53f5d Vendor libnetwork and github.com/vishvananda/netlink
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:36 -07:00
Aaron Lehmann
d626875a94 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:32 -07:00
Sebastiaan van Stijn
9a3e47511a
bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-23 01:05:45 +02:00
Daniel Nephin
1ea9c19ffe Require manpages for packages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-22 16:34:46 -04:00
Daniel Nephin
7004f219f5 Make manpages in a conatiner.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-22 16:32:51 -04:00
Tibor Vass
f5e1f6f688 Merge pull request #24823 from aaronlehmann/join-tokens
Replace secrets with join tokens
2016-07-21 18:06:55 -07:00
Aaron Lehmann
aaa0f0b246 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Aaron Lehmann
852091ad41 Revendor engine-api
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Alexandre Beslic
5189e3d50d update libkv, fix wrong error check on zookeeper list
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-07-20 17:25:39 -07:00
Sebastiaan van Stijn
7d84c71500 Merge pull request #24620 from yongtang/24270-service-list-filter
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
2016-07-20 21:25:06 +02:00
Yong Tang
467107cd40 Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.

This is part of step to fix #24270.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-20 08:16:54 -07:00
Justin Cormack
4d7038208f Do not default to external linking on arm, i386
Reverts https://github.com/docker/docker/pull/18197

This was a workaround before Go 1.6, not required any more.

cc @nalind @Govinda-Fichtner

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 11:21:26 +01:00
Arnaud Porterie
ffba13f435 Merge pull request #24648 from mlaventure/fix-kill-test
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
2016-07-19 18:24:34 +00:00
Arnaud Porterie
ac26ee15df Merge pull request #23825 from dnephin/auto-gen-man-page
Generate man pages from the Command description
2016-07-19 18:22:01 +00:00
Tibor Vass
39327a67e8 Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
2016-07-19 11:18:22 -07:00
Michael Crosby
04104c3a1e Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-19 09:31:43 -07:00
Daniel Nephin
47cca88c8c Dont run man generation as part of test-unit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:35 -04:00
Daniel Nephin
00a8a40398 Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:21 -04:00
Sebastiaan van Stijn
589bafddf3
bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-18 23:15:03 +02:00
Kenfe-Mickael Laventure
29b2714580 Vendor in new containerd
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-18 11:44:24 -07:00
Aaron Lehmann
db9bc51cbe Update vendored go-events
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-18 10:38:27 -07:00