Tibor Vass
0ab40a7552
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
2017-03-02 16:03:39 -08:00
Justin Cormack
0b9fddb789
Merge pull request #31478 from cyphar/seccomp-fix-unsupported-build
...
profiles: seccomp: fix !seccomp build
2017-03-02 09:23:28 -08:00
Sven Dowideit
9bebc635a2
Merge pull request #31484 from thaJeztah/waves-bye-to-down-under
...
Move Sven to alumni
2017-03-02 23:17:49 +10:00
Sebastiaan van Stijn
26537cafbc
Move Sven to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 14:08:52 +01:00
Vincent Demeester
6361117b59
Merge pull request #31480 from thaJeztah/carry-31213-update-experimental-index
...
[carry 31213] Update index.md
2017-03-02 12:22:12 +01:00
scjane
e20bbe59e9
Update index.md
...
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 12:18:55 +01:00
Sebastiaan van Stijn
75483d2124
Merge pull request #31476 from thaJeztah/update-poule-config
...
update poule-config; add Yong to auto-assignment
2017-03-02 11:23:44 +01:00
Vincent Demeester
3b5d8e6a8d
Merge pull request #31339 from albers/completion-service-ps--only-one-service
...
Bash completion for `docker service ps` completes only one service
2017-03-02 11:21:17 +01:00
Sebastiaan van Stijn
da3c711c12
update poule-config; add Yong to auto-assignment
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 11:15:40 +01:00
Aleksa Sarai
a3155743ad
profiles: seccomp: fix !seccomp build
...
Previously building with seccomp disabled would cause build failures
because of a mismatch in the type signatures of DefaultProfile().
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-03-02 21:13:17 +11:00
Vincent Demeester
3e561e4a84
Merge pull request #31356 from coolljt0725/fix_suspend
...
devicemapper: Fix suspend a removed device
2017-03-02 10:11:48 +01:00
Akihiro Suda
6b615d7638
Merge pull request #31472 from fate-grand-order/fixed
...
fix func name "BuildFromContext" in comment
2017-03-02 18:11:04 +09:00
fate-grand-order
d37df06ebe
fix func name "BuildFromContext" in comment
...
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
2017-03-02 17:00:40 +08:00
Sebastiaan van Stijn
1a412a0470
Merge pull request #31460 from vdemeester/integration-clean-in-env-p1
...
Move TearDownTest cleaning to environment package
2017-03-02 09:51:46 +01:00
Sebastiaan van Stijn
9321a12115
Merge pull request #31467 from thaJeztah/remove-jekyll-markers
...
remove Jekyll tags from CLI reference
2017-03-02 08:27:12 +01:00
Kenfe-Mickaël Laventure
d8b0d2b9e9
Merge pull request #30729 from dmcgowan/update-go-connections
...
Update go-connections package
2017-03-01 18:24:32 -08:00
Sebastiaan van Stijn
7e3169f26d
remove Jekyll tags from CLI reference
...
These Markdown files are now embedded in a YAML
file for templating in the documentation, and
these special markers are no longer needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 02:14:15 +01:00
Alexander Morozov
9358189fa3
Merge pull request #30657 from madhanrm/ns1
...
Support --net=container:<NameOrID> for windows (Shared Pod Network)
2017-03-01 13:59:52 -08:00
Brian Goff
563eb10202
Merge pull request #31434 from tophj-ibm/skip-more-plugin-tests
...
[multi-arch] skip more plugin tests on non-x86
2017-03-01 16:01:28 -05:00
Sebastiaan van Stijn
01ed606439
Merge pull request #29775 from AkihiroSuda/integration-cli-on-swarm
...
[EXPERIMENTAL] Integration Test on Swarm (completes in about 5 minutes, with 10 Swarm nodes)
2017-03-01 21:16:05 +01:00
Vincent Demeester
1858656925
Move TearDownTest cleaning to environment package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-01 21:04:11 +01:00
Sebastiaan van Stijn
bb9f19503c
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
2017-03-01 18:10:57 +01:00
Lei Jitang
6e25bb2ed6
devicemapper: fix suspend removed device
...
when doing devices.cancelDeferredRemoval, the device could have been removed
and return ErrEnxio, but it continue to check if it is need to do suspend.
doSuspend := devinfo != nil && devinfo.Exists != 0 uses a devinfo which is
get before devices.cancelDeferredRemoval(baseInfo), it is outdate, the device
has been removed and there is no need to do suspend. If do suspend it will return
devicemapper: Error running deviceSuspend dm_task_run failed.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-03-01 21:58:14 +08:00
Sebastiaan van Stijn
fabe16ee34
Merge pull request #31412 from vdemeester/integration-request-pass
...
[test-integration] convert request.SockRequestRaw to appropriate methods
2017-03-01 14:15:50 +01:00
Sebastiaan van Stijn
822abee151
Merge pull request #31124 from vdemeester/volume-unit-tests
...
Add unit tests to cli/command/volume package
2017-03-01 14:13:47 +01:00
Vincent Demeester
72989415ac
Merge pull request #31442 from lixiaobing10051267/masterBuildTest
...
fix wrong foo to zzz in docker_cli_build_test.go
2017-03-01 11:51:44 +01:00
lixiaobing10051267
2276de8704
fix wrong foo to zzz in docker_cli_build_test.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-03-01 17:49:54 +08:00
Madhan Raj Mookkandy
040afcce8f
(*) Support --net:container:<containername/id> for windows
...
(*) (vdemeester) Removed duplicate code across Windows and Unix wrt Net:Containers
(*) Return unsupported error for network sharing for hyperv isolation containers
Signed-off-by: Madhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com>
2017-02-28 20:03:43 -08:00
Tianon Gravi
6e04fbf748
Merge pull request #31076 from AkihiroSuda/check-vendor
...
hack/validate/vendor: add more checks
2017-02-28 15:35:16 -08:00
Christopher Jones
362d082b6e
[multi-arch] skip more plugin tests on non-x86
...
Until the plugins are multi-arch plugins, or built on runtime,
skip these tests like we do with the remainder of the plugin tests.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-02-28 16:53:30 -05:00
Sebastiaan van Stijn
fe9ab05886
Merge pull request #31425 from vieux/choose_cross
...
pass DOCKER_CROSSPLATFORMS to the container in the Makefile
2017-02-28 19:28:19 +01:00
Aaron Lehmann
b88429f8ca
Merge pull request #31419 from thaJeztah/buffer-test-coverage
...
Improve coverage of pkg/ioutils/buffer
2017-02-28 10:19:54 -08:00
Victor Vieux
8aa1158164
pass DOCKER_CROSSPLATFORMS to the container in the Makefile
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-28 10:14:19 -08:00
Sebastiaan van Stijn
d265590a98
Merge pull request #31418 from thaJeztah/more-auto-assign
...
Add more maintainers to "auto-assign"
2017-02-28 18:34:00 +01:00
Vincent Demeester
40f390e67e
Merge pull request #31384 from allencloud/validate-extrahosts-in-deamon-side
...
validate extraHosts in daemon side
2017-02-28 18:28:10 +01:00
Sebastiaan van Stijn
e77c2001aa
Merge pull request #31354 from anusha-ragunathan/dial_socket
...
Net dial to the plugin socket during enable.
2017-02-28 18:24:56 +01:00
Vincent Demeester
f85ee17810
Convert request.SockRequestRaw to appropriate methods
...
`request.SockRequestRaw` is deprecated, let's use appropriate methods
for those. This is a first pass, `SockRequest` still needs to be removed.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 17:12:30 +01:00
Vincent Demeester
ae00a139cb
Merge pull request #31190 from albers/completion-hide-aliases
...
Hide aliases in bash completion of `docker node|service`
2017-02-28 16:54:53 +01:00
Vincent Demeester
38d985a1c1
Merge pull request #31290 from thaJeztah/print-d_type_warning
...
add d_type warning to docker info, and optimize output
2017-02-28 16:35:00 +01:00
Sebastiaan van Stijn
d10915ba6c
Add more maintainers to "auto-assign"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-28 14:39:48 +01:00
Lei Jitang
fdcc7879c8
Merge pull request #31413 from lixiaobing10051267/masterRx
...
update Reported less Txbytes to RxPackets in docker_api_stats_test.go
2017-02-28 21:20:39 +08:00
Sebastiaan van Stijn
392ece2239
Improve coverage of pkg/ioutils/buffer
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-28 14:11:15 +01:00
Vincent Demeester
98a1d9a712
Merge pull request #30843 from vdemeester/daemon-duplication-refactor
...
Few daemon duplication refactor
2017-02-28 13:14:07 +01:00
lixiaobing10051267
5690de3c0e
update Reported less Txbytes to RxPackets in docker_api_stats_test.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-02-28 19:42:35 +08:00
Vincent Demeester
250e05e427
Add a lockedManagerAction method to Cluster…
...
… in order to remove duplication.
Each time we update a cluster object, we do some common
operations (lock, verify it's on a manager, get the request context,
and the update). This introduce a method and refactor few
update/remove method that allows to duplicate less code.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:12:11 +01:00
Vincent Demeester
f7819fcb25
Refactor cpu-realtime file creation to remove duplication
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:12:06 +01:00
Vincent Demeester
2028d8698d
Reduce duplication in graphdriver
...
Removes some duplication in counter.go and proxy.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:12:02 +01:00
Vincent Demeester
cb6832c6d3
Extract common code from disconnectFromNetwork and releaseNetwork
...
Both method are trying to detach the container from a cluster
network. The code is exactly the same, this removes the duplication.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:11:59 +01:00
Vincent Demeester
af0d9bdfe4
Refactor publish/expose filter to remove duplication
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:11:55 +01:00
Vincent Demeester
12485d62ee
Introduce a CheckContainer to remove duplication
...
Some methods need to get a container *and* validate some conditon on
these (is the container running, …). The CheckContainer allows
to do that and helps remove some duplication.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-28 11:11:48 +01:00