Commit Graph
36884 Commits
Author SHA1 Message Date
allencloud 4340eba05a make secret update support name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9d30525a04e2d4efe51ac9e6c114ce36276aafa8
Component: engine
2017-03-07 16:01:21 +08:00
Aaron Lehmann ec64fef8e0 cluster: Renew the context after communicating with the registry
When pinning by digest, the registry might be slow or unresponsive. This
could cause the context to already be expired by the time UpdateService
or CreateService is called. We want digest pinning to be a best-effort
operation, so it's problematic if a slow or misbehaving registry
prevents the service operation from completing. Replace the context
after communicating with the registry, so we have a fresh timeout for
the gRPC call.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f8273a216ed35e22ac157dee8055393f07d4be39
Component: engine
2017-03-06 16:05:56 -08:00
Tibor Vass 0b1f6d26c9 Merge pull request #31340 from anusha-ragunathan/plugin_nw_filter
Add network plugin filter test
Upstream-commit: 65068ea4c0fdaf300d0c7a06b3478c6c1c6d4271
Component: engine
2017-03-06 15:31:59 -08:00
Daniel Nephin 92345732e9 Some things just need to be line wrapped.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2238492c51
Component: cli
2017-03-06 16:01:57 -05:00
Daniel Nephin aa4b36806a Some things just need to be line wrapped.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2e9f9d2c347186a29fc558e1c95d5246fad66c2a
Component: engine
2017-03-06 16:01:57 -05:00
Vincent Demeester 00f7fe38c2 Merge pull request #30807 from chchliang/networkproject
Check parameter --ip --ip6 --link-local-ip in `docker network connect`
Upstream-commit: de5ca681b5aa170d8e486b7a2a3a144fc032ed70
Component: engine
2017-03-06 21:11:55 +01:00
Anusha Ragunathan 3dd6267361 Add network plugin filter test
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 5e0e957061795535d893dd0f320e82940b6b01a1
Component: engine
2017-03-06 12:05:20 -08:00
Victor Vieux f799b6971e Merge pull request #31577 from thaJeztah/update-changelog-17.03.0-ce
Update changelog 17.03.0 ce
Upstream-commit: a2bf823a94f77bb041a5ef336c689adb09a593b6
Component: engine
2017-03-06 11:19:26 -08:00
Sebastiaan van Stijn f18f03bc0c Merge pull request #31580 from thaJeztah/move-jana-to-alumni
Move Jana to alumni
Upstream-commit: 31930bdfe1a179b6bf79c2887ce97eb4af0d9346
Component: engine
2017-03-06 20:17:19 +01:00
Vincent Demeester 52b69d7432 Merge pull request #31578 from vdemeester/request-daemon-host
[test-integration] Update request.* signature to remove the host
Upstream-commit: 4e051181f708972e903d82d99f6076b4dd38da37
Component: engine
2017-03-06 19:45:01 +01:00
Kenfe-Mickaël Laventure 73a09fcbca Merge pull request #31194 from albers/completion-volume-aliases
Add support for command aliases to bash completion of `docker volume`
Upstream-commit: c6e102c830716b016ea56056555631112e5348d2
Component: engine
2017-03-06 09:52:41 -08:00
Sebastiaan van Stijn 5b5acf04b4 Move Jana to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1aeb2cf7cbdcc37af187696fc4c6b087048ccc8a
Component: engine
2017-03-06 18:22:00 +01:00
Keith Hudgins 01d59db55d added listing for Nimble Storage's volume plugin
Signed-off-by: Keith Hudgins <greenman@greenman.org>

updated nimble plugin url
Upstream-commit: 05f37ad4f5a9c2c6ef634de9c0c8be6910d659d3
Component: engine
2017-03-06 12:15:25 -05:00
Daniel Nephin 19021e1a48 Convert new compose volume type to swarm mount type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 63c3221dd3
Component: cli
2017-03-06 11:45:01 -05:00
Daniel Nephin 5b615e9588 Convert new compose volume type to swarm mount type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a1bbb2f7eac511fa1ccbff37a6b07a986a291838
Component: engine
2017-03-06 11:45:01 -05:00
Daniel Nephin 53c21bb298 Support expanded mounts in Compose loader
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29f39ea244
Component: cli
2017-03-06 11:45:01 -05:00
Daniel Nephin c8a5ce81db Support expanded mounts in Compose loader
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 190dc5a40ab330bf0c2e2ce2954fd72526cabfe1
Component: engine
2017-03-06 11:45:01 -05:00
Daniel Nephin 48d10d2797 Parse a volume spec on the client, with support for windows drives
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a442213b92
Component: cli
2017-03-06 11:45:01 -05:00
Daniel Nephin e14d3ca672 Parse a volume spec on the client, with support for windows drives
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 32c955b8fe7045e64b8f493c52af43f620373bec
Component: engine
2017-03-06 11:45:01 -05:00
Daniel Nephin d9230d0bd1 Add expanded mount syntax to Compose schema and types.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d2d48f3f69
Component: cli
2017-03-06 11:45:01 -05:00
Daniel Nephin 578c6e5b0b Add expanded mount syntax to Compose schema and types.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 65c899bee501a81e004187528e732d944ef904d5
Component: engine
2017-03-06 11:45:01 -05:00
Sebastiaan van Stijn 1f8e7d6f38 Fix duplicate "swarm mode" heading
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2de9de60cdbe918cd584099ff35717c710786baf
Component: engine
2017-03-06 16:56:45 +01:00
Vincent Demeester fea75fa014 Update request.* signature to remove the host
99.9% of use case for request call are using daemonHost. This makes it
default and adds a `request.DoOnHost` function to be able to specify
the host for specific, more complex use cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b11ba1231ef0ac99279ed5dcd76d81413d7d63b5
Component: engine
2017-03-06 16:41:33 +01:00
Victor Vieux 2bfb0e38ba add -ce support
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 44aec1b69261e8cee0dd416adbbe7a2443f759d6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 98b7c4b00a9908e2ca46bcc134bcf38ac166509a
Component: engine
2017-03-06 16:33:20 +01:00
Victor Vieux 2acf08cb52 update CHANGELOG
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 4fa77953f8d51149afbead5dfe5930580f2cc022)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce67699ede1e77dbbe6f8a668c6155728f9ad9dc
Component: engine
2017-03-06 15:57:53 +01:00
Victor Vieux 4d2d615d8a Merge pull request #31205 from vieux/update_changelog_17.03
update CHANGELOG for 17.03.0-ce
(cherry picked from commit 9fb5c83df051fc2c2335fad0d3738539d1b4c264)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ee887f327d82b72994aa2f661d9d3401573a707c
Component: engine
2017-03-06 15:57:44 +01:00
Victor Vieux af1b667c19 fix CHANGELOG date
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit ce07fb6b0f1b8765b92022e45f96bd4349812e06)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dff2a0ac126c15f1d141126c33bda0f92ab9b0da
Component: engine
2017-03-06 15:57:36 +01:00
Victor Vieux a8b8ebdf6e bump 17.03.1-ce-rc1
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 1c44f35eb1f593839eec00f9ce810913e7309ef2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6db395b966cf44716d369c26dec2a5aabe6e2c1d
Component: engine
2017-03-06 15:52:13 +01:00
Sebastiaan van Stijn 2afc0a3b17 Merge pull request #31543 from chawlanikhil24/master
Replaced "err" with  "nil" & added a comment
Upstream-commit: 3b8ecc089b
Component: cli
2017-03-06 15:11:14 +01:00
Sebastiaan van Stijn e9ce01080a Merge pull request #31543 from chawlanikhil24/master
Replaced "err" with  "nil" & added a comment
Upstream-commit: 3cfc3e30a886aef1a5e767d5b2a9a7b2c156c5f9
Component: engine
2017-03-06 15:11:14 +01:00
Sebastiaan van Stijn efa1df2f92 Merge pull request #31549 from cyphar/TestDaemonCommand-fix
cmd: docker: fix TestDaemonCommand
Upstream-commit: 6753b3bef3176fca25c512102c07b720374e3cfb
Component: engine
2017-03-06 15:10:40 +01:00
Vincent Demeester e7e6e755c3 Merge pull request #31450 from thaJeztah/fix-volume-force-remove
do not ignore "volume in use" errors when force-delete
Upstream-commit: 95cb74818a92de99b42c0c10f9ae4710c27357f4
Component: engine
2017-03-06 14:35:46 +01:00
Nikhil Chawla b6d1eb4781 Fixed the typo in the code
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
Upstream-commit: 80a8d7ca26
Component: cli
2017-03-06 17:31:04 +05:30
Nikhil Chawla 8e858ae994 Fixed the typo in the code
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
Upstream-commit: 73309aa009702dbcb5ac0c32499c984797ba9f4b
Component: engine
2017-03-06 17:31:04 +05:30
Brian Goff 6b811850e3 Merge pull request #31558 from albers/completion-service--rollback
Add bash completion for `service create|update --rollback-*`
Upstream-commit: 3fdb0c57efcd7847eedcec8382fa1684bb287964
Component: engine
2017-03-05 22:29:52 -05:00
Harald Albers 6d7ce8e47f Improve bash completion for service create|update --update-failure-action
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 07a5119b1a20706e47b15623eee2f0dc20ed1d4d
Component: engine
2017-03-05 10:42:44 -08:00
Harald Albers 8325aab7a8 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>
Upstream-commit: 5a9425c41754f479e27a03495f74f028a2c876b4
Component: engine
2017-03-05 10:41:19 -08:00
Aleksa Sarai d1cc836571 cmd: docker: fix TestDaemonCommand
In more recent versions of Cobra, `--help` parsing is done before
anything else resulting in TestDaemonCommand not actually passing. I'm
actually unsure if this test ever passed since it appears that !daemon
is not being run as part of the test suite.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: aa74f27866
Component: cli
2017-03-05 15:26:49 +11:00
Aleksa Sarai b34943b2d7 cmd: docker: fix TestDaemonCommand
In more recent versions of Cobra, `--help` parsing is done before
anything else resulting in TestDaemonCommand not actually passing. I'm
actually unsure if this test ever passed since it appears that !daemon
is not being run as part of the test suite.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: dd7159060f60ea04007c069df189a29fda2c655f
Component: engine
2017-03-05 15:26:49 +11:00
Yong Tang 162bfc910b Merge pull request #31108 from aaronlehmann/automatic-rollback
Automatic service rollback on failure
Upstream-commit: 338565805c31783c63f9bb35d5b24f4c0c5656d3
Component: engine
2017-03-03 18:47:14 -08:00
Aaron Lehmann 4009dade43 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>
Upstream-commit: 78c204ef79
Component: cli
2017-03-03 16:33:34 -08:00
Aaron Lehmann 41bd9caf74 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>
Upstream-commit: eafb5565c9
Component: cli
2017-03-03 16:33:34 -08:00
Aaron Lehmann d82df5d4ba 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>
Upstream-commit: f9bd8ec8b268581f93095c5a80679f0a8ff498bf
Component: engine
2017-03-03 16:33:34 -08:00
Aaron Lehmann b3a86717f1 Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8de01fb7a8
Component: cli
2017-03-03 16:33:34 -08:00
Aaron Lehmann ac66308e6c Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3a88a24d23e6eb1ca521cd9ab6e306d4ba1c1464
Component: engine
2017-03-03 16:33:34 -08:00
Aaron Lehmann 3fc9649978 Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 5232868f46
Component: cli
2017-03-03 16:33:34 -08:00
Aaron Lehmann 0c390668f1 Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cc9d04647a68cf49e66bf26f10908387b99dae1a
Component: engine
2017-03-03 16:33:34 -08:00
Alessandro Boch ea6ef2786d Add test for anonymous container w/ net-alias on swarm network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ef794c3649c3a2085289aacbcb7f37fb02cb6523
Component: engine
2017-03-03 15:55:06 -08:00
Alessandro Boch df253ac5fd Vendoring libnetwork @1a01921
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b005c7d6ebf7c980b1247532188dfe741659b175
Component: engine
2017-03-03 15:55:06 -08:00
Aaron Lehmann 07d28f45ab Merge pull request #31533 from yongtang/30733-fix
Fix error caused by overlapping merge of #30733
Upstream-commit: 94d1a5b366152e5384a4bb925a40bf0a8c554a72
Component: engine
2017-03-03 15:19:00 -08:00