Commit graph

31405 commits

Author SHA1 Message Date
Chris Gibson
b4a1634cec Fix fish autocompletion with custom ps output
In the docker config.json, if `psFormat` or `imagesFormat` is set to a
non-standard format, it breaks autocompletion.

This fixes the issue by using a custom format.

Signed-off-by: Chris Gibson <chris@chrisg.io>
2017-03-08 14:19:48 +08:00
Akihiro Suda
193730bec1 Merge pull request #31620 from justincormack/seccomp-up
Seccomp Update
2017-03-08 12:38:17 +09:00
Aaron Lehmann
39433318fe Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-07 19:09:21 -08:00
Akihiro Suda
5a1b06d7fd rerun vndr
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-08 02:29:34 +00:00
Aaron Lehmann
497c4f05b9 Fix dropped field in task translation from GRPC to REST
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-07 14:55:15 -08:00
Justin Cormack
9067ef0e32 Seccomp Update
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 22:19:46 +00:00
Brian Goff
fd5f9d7941 Merge pull request #31265 from cyli/remove_swarm_subdirs
Rather than remove the swarm directory and re-create, remove the subdirs
2017-03-07 14:30:34 -05:00
Brian Goff
dd221a1e17 Merge pull request #31258 from dnephin/fix-override-default-stack-network
Support customizing the default network for a stack
2017-03-07 14:28:16 -05:00
Arash Deshmeh
96039b394a stack deploy exits with error if both 'external' and any other options are specified for volumes
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-03-07 14:21:45 -05:00
James Nesbitt
a1560a0cf2 exported cli compose loader parsing methods
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
2017-03-07 17:36:35 +02:00
Daniel Nephin
afcaeedbd4 Use opts.MemBytes for flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-07 10:32:49 -05:00
Brian Goff
ba5c0f88d5 Merge pull request #30568 from khudgins/nimbleplugin
added listing for Nimble Storage's volume plugin
2017-03-07 09:31:53 -05:00
Christopher Jones
e3c6cbed22 skip plugin test on non x86 architectures
Because the plugins in dockerhub aren't multi-arch, they will
fail on non x86-64 platforms. Comment this test out like we do with
the others.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-03-07 09:28:10 -05:00
Vincent Demeester
7bf4085264 Merge pull request #31198 from docbobo/master-manpages-aarch64
Improved aarch64 build
2017-03-07 13:53:48 +01:00
allencloud
9d30525a04 make secret update support name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-07 16:01:21 +08:00
Aaron Lehmann
f8273a216e 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>
2017-03-06 16:05:56 -08:00
Tibor Vass
65068ea4c0 Merge pull request #31340 from anusha-ragunathan/plugin_nw_filter
Add network plugin filter test
2017-03-06 15:31:59 -08:00
Daniel Nephin
2e9f9d2c34 Some things just need to be line wrapped.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-06 16:01:57 -05:00
Vincent Demeester
de5ca681b5 Merge pull request #30807 from chchliang/networkproject
Check parameter --ip --ip6 --link-local-ip in `docker network connect`
2017-03-06 21:11:55 +01:00
Anusha Ragunathan
5e0e957061 Add network plugin filter test
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-06 12:05:20 -08:00
Victor Vieux
a2bf823a94 Merge pull request #31577 from thaJeztah/update-changelog-17.03.0-ce
Update changelog 17.03.0 ce
2017-03-06 11:19:26 -08:00
Sebastiaan van Stijn
31930bdfe1 Merge pull request #31580 from thaJeztah/move-jana-to-alumni
Move Jana to alumni
2017-03-06 20:17:19 +01:00
Vincent Demeester
4e051181f7 Merge pull request #31578 from vdemeester/request-daemon-host
[test-integration] Update request.* signature to remove the host
2017-03-06 19:45:01 +01:00
Kenfe-Mickaël Laventure
c6e102c830 Merge pull request #31194 from albers/completion-volume-aliases
Add support for command aliases to bash completion of `docker volume`
2017-03-06 09:52:41 -08:00
Sebastiaan van Stijn
1aeb2cf7cb
Move Jana to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 18:22:00 +01:00
Keith Hudgins
05f37ad4f5
added listing for Nimble Storage's volume plugin
Signed-off-by: Keith Hudgins <greenman@greenman.org>

updated nimble plugin url
2017-03-06 12:15:25 -05:00
Daniel Nephin
a1bbb2f7ea Convert new compose volume type to swarm mount type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-06 11:45:01 -05:00
Daniel Nephin
190dc5a40a Support expanded mounts in Compose loader
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-06 11:45:01 -05:00
Daniel Nephin
32c955b8fe Parse a volume spec on the client, with support for windows drives
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-06 11:45:01 -05:00
Daniel Nephin
65c899bee5 Add expanded mount syntax to Compose schema and types.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-06 11:45:01 -05:00
Sebastiaan van Stijn
2de9de60cd
Fix duplicate "swarm mode" heading
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 16:56:45 +01:00
Vincent Demeester
b11ba1231e
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>
2017-03-06 16:41:33 +01:00
Victor Vieux
98b7c4b00a
add -ce support
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 44aec1b692)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 16:33:20 +01:00
Victor Vieux
ce67699ede
update CHANGELOG
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 4fa77953f8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 15:57:53 +01:00
Victor Vieux
ee887f327d
Merge pull request #31205 from vieux/update_changelog_17.03
update CHANGELOG for 17.03.0-ce
(cherry picked from commit 9fb5c83df0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 15:57:44 +01:00
Victor Vieux
dff2a0ac12
fix CHANGELOG date
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit ce07fb6b0f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 15:57:36 +01:00
Victor Vieux
6db395b966
bump 17.03.1-ce-rc1
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 1c44f35eb1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 15:52:13 +01:00
Sebastiaan van Stijn
3cfc3e30a8 Merge pull request #31543 from chawlanikhil24/master
Replaced "err" with  "nil" & added a comment
2017-03-06 15:11:14 +01:00
Sebastiaan van Stijn
6753b3bef3 Merge pull request #31549 from cyphar/TestDaemonCommand-fix
cmd: docker: fix TestDaemonCommand
2017-03-06 15:10:40 +01:00
Vincent Demeester
95cb74818a Merge pull request #31450 from thaJeztah/fix-volume-force-remove
do not ignore "volume in use" errors when force-delete
2017-03-06 14:35:46 +01:00
Nikhil Chawla
73309aa009 Fixed the typo in the code
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
2017-03-06 17:31:04 +05:30
Brian Goff
3fdb0c57ef Merge pull request #31558 from albers/completion-service--rollback
Add bash completion for `service create|update --rollback-*`
2017-03-05 22:29:52 -05:00
Harald Albers
07a5119b1a Improve bash completion for service create|update --update-failure-action
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-05 10:42:44 -08:00
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
Aleksa Sarai
dd7159060f
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>
2017-03-05 15:26:49 +11: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
Alessandro Boch
ef794c3649 Add test for anonymous container w/ net-alias on swarm network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-03 15:55:06 -08:00