Commit graph

35264 commits

Author SHA1 Message Date
Sebastiaan van Stijn
67f26c79d9
Merge pull request #37236 from johnstep/fix-client-test-env-cleanup
Clean up in TestNegotiateAPIVersionEmpty
2018-06-08 13:06:53 -07:00
Sebastiaan van Stijn
a7b6643c5f
Merge pull request #36161 from fanjiyun/edit
When link id is empty for overlay2, do not remove this link.
2018-06-08 09:12:22 -07:00
Sebastiaan van Stijn
d072a3658b
Merge pull request #37240 from francescomari/toolbox-link
Fix link to Docker Toolbox
2018-06-08 07:23:32 -07:00
Francesco Mari
a045b027bf Fix link to Docker Toolbox
Signed-off-by: Francesco Mari <mari.francesco@gmail.com>
2018-06-08 16:12:00 +02:00
Vincent Demeester
162ba6016d
Merge pull request #37195 from adshmh/refactor-integration-test-create-network-calls-macvlan
Refactor macvlan network integration tests to use network.Create
2018-06-08 09:46:04 +02:00
Vincent Demeester
712dd62a34
Merge pull request #37234 from kolyshkin/plugin-panic
Fix daemon panic on restart when a plugin is running
2018-06-08 09:45:25 +02:00
Vincent Demeester
fe3d0233ef
Merge pull request #37235 from kunaltyagi/vim-filename
[vim] Be case insensitive for D in dockerfile
2018-06-08 09:39:18 +02:00
Tõnis Tiigi
4703b284e6
Merge pull request #37233 from dnephin/add-metrics-for-pull
Add image metrics for push and pull
2018-06-08 00:26:12 -07:00
Sebastiaan van Stijn
52ea99eda2
Merge pull request #37189 from arm64b/create-intermediate-for-COPY-ADD
Refactor and cleanup the intermediate container creation
2018-06-07 21:20:17 -07:00
Sebastiaan van Stijn
e3e552ac81
Merge pull request #34218 from yosifkit/close-readclosers
Close readclosers returned by DecompressStream
2018-06-07 20:42:30 -07:00
John Stephens
b801361064
Clean up in TestNegotiateAPIVersionEmpty
Signed-off-by: John Stephens <johnstep@docker.com>
2018-06-07 20:05:29 -07:00
Sebastiaan van Stijn
f11f249588
Merge pull request #37183 from vdemeester/service-create-init
Add support for `init` on services
2018-06-07 19:22:14 -07:00
Kunal Tyagi
6b8dab2181 Allow vim be case insensitive for D in dockerfile
Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com>
2018-06-08 10:30:40 +09:00
Sebastiaan van Stijn
5ff12f6ba1
Merge pull request #37231 from adshmh/use-unique-names-for-integration-tests-service-create
use unique names for resources in create service integration tests
2018-06-07 17:47:07 -07:00
fanjiyun
0e8f96e317
When id is empty for overlay2/overlay, do not remove the directories.
Signed-off-by: fanjiyun <fan.jiyun@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-07 17:35:54 -07:00
Brian Goff
dbeb432965 Fix panic on daemon restart with running plugin
Scenario:

Daemon is ungracefully shutdown and leaves plugins running (no
live-restore).
Daemon comes back up.
The next time a container tries to use that plugin it will cause a
daemon panic because the plugin client is not set.

This fixes that by ensuring that the plugin does get shutdown.
Note, I do not think there would be any harm in just re-attaching to the
running plugin instead of shutting it down, however historically we shut
down plugins and containers when live-restore is not enabled.

[kir@: consolidate code to deleteTaskAndContainer, a few minor nits]

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-06-07 17:27:02 -07:00
Daniel Nephin
6910019bbe Add image metrics for push and pull
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-06-07 18:26:12 -04:00
Vincent Demeester
d47c45175b
Merge pull request #37215 from adshmh/integration-container-links-tests-use-unique-names
container links integration tests use unique names
2018-06-07 22:34:12 +02:00
Vincent Demeester
d9b96d90c6
Merge pull request #37232 from vdemeester/o-rly
Mark @thajeztah as a MAINTAINER…
2018-06-07 22:33:45 +02:00
Joe Ferguson
76e99e1a8b Close readclosers returned by DecompressStream
Signed-off-by: Joe Ferguson <joe@infosiftr.com>
2018-06-07 11:16:13 -07:00
Vincent Demeester
7f9dd507d3
Mark @thajeztah as a MAINTAINER…
… discovered recently that our very own Sebastiaan was not even listed
in the maintainers, so fixing this mistake !

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-07 19:50:41 +02:00
Arash Deshmeh
d5ae23fc11 use unique names for resources in create service integration tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-07 12:11:11 -04:00
Vincent Demeester
e401b88e59
Add support for init on services
It's already supported by `swarmkit`, and act the same as
`HostConfig.Init` on container creation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-07 14:17:55 +02:00
Sebastiaan van Stijn
1fe0e49d20
Merge pull request #36644 from jessfraz/rawaccess
api: add MaskedPaths and ReadonlyPaths options
2018-06-06 18:16:16 -07:00
Sebastiaan van Stijn
21291e5aef
Merge pull request #37209 from thaJeztah/bump_libnetwork
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
2018-06-06 13:41:33 -07:00
Anusha Ragunathan
9b0b9a0ece
Merge pull request #37192 from thaJeztah/update_miekd_dns
Update miekg/dns to v1.0.7
2018-06-06 11:24:54 -07:00
Arash Deshmeh
077247050d integration tests under integration/container/links_linux_test.go use unique names
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-06 06:14:24 -04:00
Sebastiaan van Stijn
fd2f2a919e
Merge pull request #36895 from dmcgowan/vendor-containerd-master
Update containerd to 1.1
2018-06-05 21:43:31 -07:00
Sebastiaan van Stijn
340fd5e237
Merge pull request #37211 from vdemeester/fix-volume-unit-test
Fix wrong assertion in volume/service package
2018-06-05 13:14:13 -07:00
Sebastiaan van Stijn
fe02b18755
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-05 11:29:23 -07:00
Vincent Demeester
04207c2db9
Fix wrong assertion in volume/service package
This last assertion shouldn't be there, those cases should be handled
by the for/switch above.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-05 18:51:17 +02:00
Jess Frazelle
3694c1e34e
api: add configurable MaskedPaths and ReadOnlyPaths to the API
This adds MaskedPaths and ReadOnlyPaths options to HostConfig for containers so
that a user can override the default values.

When the value sent through the API is nil the default is used.
Otherwise the default is overridden.

Adds integration tests for MaskedPaths and ReadonlyPaths.

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
2018-06-05 12:33:14 -04:00
Arash Deshmeh
0418893f0b refactored integration tests under integration/network/macvlan to use network.Create
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-05 06:32:24 -04:00
Arash Deshmeh
0e3012cfff Added network package to integration/internal to refactor integration tests calls to client.NetworkCreate
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-05 06:32:24 -04:00
Sebastiaan van Stijn
ca25df3b54
Merge pull request #37194 from AntaresS/fix-test-failure
fix a failed test
2018-06-05 02:38:04 +02:00
Sebastiaan van Stijn
5037c5a8ce
Merge pull request #36688 from cpuguy83/volumes_service
Extract volume interaction to a volumes service
2018-06-05 02:16:20 +02:00
Derek McGowan
a0009345f5
Update containerd daemon
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-04 15:37:03 -07:00
Derek McGowan
52ed3e0896
Update containerd to 1.1
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-04 15:37:03 -07:00
Sebastiaan van Stijn
d7e94d6ea7
Merge pull request #37191 from adshmh/use-unique-names-for-integration-tests-secret
use unique names for resources in integration tests of secret package
2018-06-05 00:06:50 +02:00
Anda Xu
1d9973c0d4 fix a failed test
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-06-04 14:29:00 -07:00
Vincent Demeester
e466f999aa
Merge pull request #37197 from tonistiigi/vendor-buildkit
vendor: dockerfile parser from buildkit
2018-06-04 14:53:22 +02:00
Dennis Chen
7f280f6f65 Refactor and cleanup the intermediate container creation
This PR is trying to refactor the `probeAndCreate` and cleanup
related codes based on the refactoring.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-06-04 12:55:49 +08:00
Akihiro Suda
641e2c01cc
Merge pull request #37190 from vdemeester/allow-make-run-with-args
Allow to add any args when doing a make run
2018-06-03 03:42:02 +09:00
Tonis Tiigi
ad77dee8ba vendor: add new opentracing deps for session tracing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-02 11:10:38 -07:00
Tonis Tiigi
c9ebd2f13b vendor: use dockerfile parser from buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-02 11:10:34 -07:00
Vincent Demeester
d2af0d96e3
Allow to add any args when doing a make run
`make DOCKERD_ARGS=--init binary run` should start the daemon with
`--init` as flags (with any other "automagically" added ones).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-01 19:19:20 +02:00
Sebastiaan van Stijn
4acddf21b7
Update miekg/dns to v1.0.7
This dependency now uses SemVer, tagged releases.
Also updates dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-01 16:24:59 +02:00
Arash Deshmeh
a70794aff0 use unique names for resources in integration tests of integration/secret package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-01 06:46:52 -04:00
Anusha Ragunathan
71cd53e4a1
Merge pull request #37177 from cpuguy83/minor_plugin_addr_change
Move plugin client to separate interface
2018-05-31 08:22:04 -07:00
Vincent Demeester
2ea4ece674
Merge pull request #37174 from thaJeztah/no_additional_magic_matching
Be explicit about github.com prefix being a legacy feature
2018-05-31 09:45:59 +02:00