Граф коммитов

31194 Коммитов

Автор SHA1 Сообщение Дата
Harald Albers 5a9425c417 Add bash completion for `service create|update --rollback-*`
Also remove wrong completion for `docker service create --rollback`

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-05 10:41:19 -08:00
Yong Tang 338565805c Merge pull request #31108 from aaronlehmann/automatic-rollback
Automatic service rollback on failure
2017-03-03 18:47:14 -08:00
Aaron Lehmann f9bd8ec8b2 Implement server-side rollback, for daemon versions that support this
Server-side rollback can take advantage of the rollback-specific update
parameters, instead of being treated as a normal update that happens to
go back to a previous version of the spec.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-03 16:33:34 -08:00
Aaron Lehmann 3a88a24d23 Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-03 16:33:34 -08:00
Aaron Lehmann cc9d04647a Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-03 16:33:34 -08:00
Aaron Lehmann 94d1a5b366 Merge pull request #31533 from yongtang/30733-fix
Fix error caused by overlapping merge of #30733
2017-03-03 15:19:00 -08:00
Yong Tang f2197b6794 Fix error caused by overlapping merge of 30733
This fix fixes build error caused by overlapping merge of 30733 and 28213.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-03-03 13:26:00 -08:00
Kenfe-Mickaël Laventure 9369acc776 Merge pull request #30733 from yongtang/02022017-formatter-header
Allow `--format` to use different delim in `table` format
2017-03-03 11:25:19 -08:00
Vincent Demeester cddb8981ca Merge pull request #31522 from vdemeester/fix-clean-in-env
Ignore no such container in testEnv.Clean
2017-03-03 20:24:58 +01:00
Vincent Demeester 5dd89abdf1
Ignore no such container in testEnv.Clean
When moving the clean function there, this check was not ported and
generated some errors on the CI. `deleteContainer` now fail if any
error but the clean function won't if "no such container" (because of
some races -_-).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-03 15:57:27 +01:00
Sebastiaan van Stijn 57fd478169 Merge pull request #31083 from xulike666/fight-for-readability
fix some typos from module contrib to man
2017-03-03 15:13:01 +01:00
Sebastiaan van Stijn 3a5a1c3f3d Merge pull request #30725 from aaronlehmann/topology
Topology-aware scheduling
2017-03-03 15:01:12 +01:00
Sebastiaan van Stijn e1da516598 Merge pull request #30265 from allencloud/add-CheckDuplicate-details-and-logic
add CheckDuplicate docs and logics in network
2017-03-03 14:18:52 +01:00
Sebastiaan van Stijn 10719ab6e4 Merge pull request #31511 from albers/completion-dashes-in-function-names
Improve POSIX compatibility of bash completion
2017-03-03 13:15:58 +01:00
Harald Albers 76f4681b56 Improve POSIX compatibility of bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-03 10:26:33 +01:00
Vincent Demeester dc1b0e1b2c Merge pull request #28279 from chchliang/updown
--max-concurrent-downloads,--max-concurrent-uploads must great than or equal to 0
2017-03-03 10:06:59 +01:00
Vincent Demeester f4e82d71a8 Merge pull request #31491 from rawkode/feature/healthchecks-missing-environment
Healthchecks should inherit environment
2017-03-03 08:36:37 +01:00
Vincent Demeester 305601bb31 Merge pull request #31485 from vdemeester/fix-inContainer-detection
Fix inContainer detection which CROSSPLATFORM env variable missing
2017-03-03 08:35:59 +01:00
Akihiro Suda 91f11437b6 Merge pull request #30888 from estesp/moar-manifestlist-debug-output
Add debug output to manifest list parsing
2017-03-03 13:09:38 +09:00
Brian Goff 55b955d9ff Merge pull request #31409 from yuexiao-wang/fix-version
'docker daemon' deprecation message doesn't use the new version
2017-03-02 22:02:09 -05:00
yuexiao-wang 5a9cee7bb5 'docker daemon' deprecation message doesn't use the new versioning scheme
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-03-03 17:26:49 +08:00
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
David McKay 647dce9dea
Healthchecks should inherit environment
Signed-off-by: David McKay <david@rawkode.com>
2017-03-02 16:23:56 +00:00
Vincent Demeester b985db92a3
Fix inContainer detection which CROSSPLATFORM env variable missing
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-02 14:36:37 +01: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
chchliang e59af2abe6 --max-concurrent-downloads,--max-concurrent-uploads must great than or equal to 0
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
2017-03-02 09:23:01 +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