Victor Vieux
fad8660a66
Merge pull request #28192 from allencloud/fix-docs-issue-on-service-ls-api
...
change node ls and service ls api and docs
Upstream-commit: a81385b0cb7045dfdc7302ed4144a0243e464d0b
Component: engine
2016-11-10 13:46:35 -08:00
Aaron Lehmann
5387bf18d8
Merge pull request #28251 from cyli/re-vendor-swarmkit
...
Vendor the latest swarmkit
Upstream-commit: 2161f35672047d1b621bb51f25850ba5d1405702
Component: engine
2016-11-10 13:28:31 -08:00
Michael Crosby
ef501816c9
Merge pull request #27797 from vdemeester/stats-format-names-support
...
Add support for Names and ID in stats format
Upstream-commit: 801230ce315ef51425da53cc5712eb6063deee95
Component: engine
2016-11-10 13:26:00 -08:00
Victor Vieux
6f1d87061d
Merge pull request #28043 from vieux/plugin_set_gogogo_continue
...
support mounts,devices and args for docker plugin set
Upstream-commit: fa7c1a68a68ffb7c6851c59d2c0b41091b9d6e5e
Component: engine
2016-11-10 13:24:02 -08:00
Michael Crosby
881cd023ce
Merge pull request #27753 from tonistiigi/fix-overlay-unmount
...
Fix overlay unmount for the root case
Upstream-commit: 1883b73a573fff613f944bb83e24db14d839902c
Component: engine
2016-11-10 13:14:45 -08:00
Sebastiaan van Stijn
081f2ffa6c
Merge pull request #28259 from sdurrheimer/zsh-completion-node-rm-swarm-leave-force
...
Add zsh completion for 'docker {node rm,swarm leave} -f'
Upstream-commit: b24a833f816ecd59fa733c94657efe56fd913777
Component: engine
2016-11-10 21:52:18 +01:00
Sebastiaan van Stijn
b550de0a42
Merge pull request #28255 from sdurrheimer/zsh-completion-dockerd-seccomp-profile
...
Add zsh completion for 'docker daemon --seccomp-profile'
Upstream-commit: 93591faeb5bcf3e31ce65dfa58e825f72c6e5489
Component: engine
2016-11-10 21:51:29 +01:00
Sebastiaan van Stijn
6b9d29433b
Merge pull request #28256 from sdurrheimer/zsh-completion-service-create-update-tty
...
Add zsh completion for 'docker service {create,update} --tty'
Upstream-commit: 8aa04807adcc26bd6dea26c9a1ce284c73d175b7
Component: engine
2016-11-10 21:50:29 +01:00
Sebastiaan van Stijn
1193760855
Merge pull request #28252 from sdurrheimer/zsh-completion-service-create-hostname
...
Add zsh completion for 'docker service create --hostname'
Upstream-commit: c51b16f0e4081d1270cfe28887f87a0d5a5a6859
Component: engine
2016-11-10 21:49:02 +01:00
Steve Durrheimer
6ff10b10a9
Add zsh completion for 'docker {node rm,swarm leave} -f'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 04e7fca6203287fbf2790acb4886af46f188543e
Component: engine
2016-11-10 21:31:34 +01:00
Steve Durrheimer
b67d7eab26
Add zsh completion for 'docker service {create,update} --tty'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a34a41b20b9b5849ddd316b11935c6c2754fd253
Component: engine
2016-11-10 21:25:24 +01:00
Steve Durrheimer
6ecbb91f43
Add zsh completion for 'docker daemon --seccomp-profile'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0f324a5b154baeafef730f62d779da14c54ef8db
Component: engine
2016-11-10 21:21:25 +01:00
Brian Goff
5c80e344d2
Merge pull request #28254 from sdurrheimer/zsh-completion-container-create-run-cpus
...
Add zsh completion for 'docker {run,create} --cpus'
Upstream-commit: a851cad25cd45b6d7f528210b6800ebb90d0866f
Component: engine
2016-11-10 15:16:19 -05:00
Victor Vieux
3ae73e8162
Merge pull request #28250 from sdurrheimer/zsh-completion-prune
...
Add zsh completion for new prune commands
Upstream-commit: 47dd8c7cc6fdcb158f5b6a8de230822942743076
Component: engine
2016-11-10 12:11:26 -08:00
Steve Durrheimer
84c24899c1
Add zsh completion for 'docker {run,create} --cpus'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 9b02c87f7bcb49396258e45c0487dce4a94661fc
Component: engine
2016-11-10 21:10:22 +01:00
Steve Durrheimer
32e8919fe3
Add zsh completion for 'docker service create --hostname'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ca654a417a27f72edc99e02d75d9602a9698f6e3
Component: engine
2016-11-10 21:00:17 +01:00
Victor Vieux
1bc2b60fd4
update swagger and docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: aef1dec9a6dbf1dcf4b43417c3c5fafda2ede957
Component: engine
2016-11-10 11:58:15 -08:00
Victor Vieux
a5ddd33ae3
support mounts, devices and args for docker plugin set
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: fc7a2652588ed30e3b3a10ab72329e82f0440236
Component: engine
2016-11-10 11:55:48 -08:00
cyli
e2a7e2f897
Vendor the latest swarmkit PR
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: b399d29a57dad9c9fe14bf07431eb57a9ef0d2ac
Component: engine
2016-11-10 11:53:02 -08:00
Steve Durrheimer
fb791c891a
Add zsh completion for new prune commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 712445607d5c5e03ea39bd9c6403104565a0d342
Component: engine
2016-11-10 20:51:44 +01:00
Sebastiaan van Stijn
64ff7ea1bd
Merge pull request #28223 from bfirsh/update-swagger
...
Update swagger.yaml with recent API changes
Upstream-commit: a2937b201377f01ce5871de91b5943e0c369e5f8
Component: engine
2016-11-10 20:49:55 +01:00
cyli
3c13ce07e7
Fix an issue in the swarm unlock-key rotate test where we were never updating the
...
previous generation unlock key.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 81f3e699c30fe412de0fa48dfa2885181f5d5002
Component: engine
2016-11-10 11:48:39 -08:00
Sebastiaan van Stijn
4e58c5cd9f
Merge pull request #28182 from msabansal/overlayexternal
...
Swarm-mode overlay networking support for windows
Upstream-commit: 4705728b41db6f0951564e48d573f439a092bd63
Component: engine
2016-11-10 20:42:51 +01:00
Vincent Demeester
6e3362c7d8
Merge pull request #28198 from sdurrheimer/zsh-completion-system-subcommand
...
Add zsh completion for new 'docker system' subcommands
Upstream-commit: b7ecc2e3c0e7c88e55972c0ec3aef42b052c24b1
Component: engine
2016-11-10 20:24:43 +01:00
Steve Durrheimer
3c72f5dda6
Add zsh completion for 'docker system' subcommands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 9df7cdcb2e6e169e0d41458bf86e02203a4fe0cd
Component: engine
2016-11-10 20:17:58 +01:00
Andrea Luzzardi
a2106ea21e
Merge pull request #28173 from nishanttotla/pin-images-by-digest
...
Pin images by digest
Upstream-commit: c13bf5ba51c4f6a1ba5e5c0da0d4f85d2d5b9116
Component: engine
2016-11-10 10:59:28 -08:00
allencloud
e312e280e3
change node ls and service ls api and docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 48c3fcedfa95f7c12868b218bd831dac8e04864f
Component: engine
2016-11-11 02:51:19 +08:00
Sebastiaan van Stijn
cd96217228
Merge pull request #28243 from andrewhsu/change-context
...
use "golang.org/x/net/context" instead of "context"
Upstream-commit: 02918908af98d95652668f015275747907e78c68
Component: engine
2016-11-10 19:13:56 +01:00
Ben Firshman
88e56044f3
Update misc things in swagger.yaml
...
Changes to docs/reference/api/docker_remote_api_v1.25.md up to
and including 2d4203222574623b10d94817b9959a08698f516b
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 48af987afe15a6bc3528a45b36c79448abbc8836
Component: engine
2016-11-10 10:10:12 -08:00
Ben Firshman
496eea904f
Add /plugins/{name}/set endpoint to swagger.yaml
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 54c37ecc23e008fa2a7c3c104f87f5e430bf9b29
Component: engine
2016-11-10 10:10:12 -08:00
Ben Firshman
53ab25ee19
Add prune endpoints to swagger.yaml
...
Introduced in #26108
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 50a5f3afafadf2b7cfbbf5b7dfba649683608a75
Component: engine
2016-11-10 10:07:25 -08:00
Sandeep Bansal
cf52bc83b2
Vendoring latest swarmkit and libnetwork
...
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com >
Upstream-commit: 6e951656792bb3cad17d579a628b333cebcad3e7
Component: engine
2016-11-10 09:54:47 -08:00
msabansal
7cfb8aa321
Swarm-mode overlay networking support for windows
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: ed8ccc304621289298fdb7aac4239cfe767b7bae
Component: engine
2016-11-10 09:54:40 -08:00
Tibor Vass
7b76246b62
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
Upstream-commit: 89cc35447d96f6dbd5503d76883c33742076ca10
Component: engine
2016-11-10 09:47:15 -08:00
Andrew Hsu
136327ac5a
use "golang.org/x/net/context" instead of "context"
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 2de83a430d5d3f82346cafa15f4bd1f7c47dde12
Component: engine
2016-11-10 08:23:19 -08:00
Sebastiaan van Stijn
7e57dfce61
Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions
...
Fix creation of the APT repo directory structure for similar distros
Upstream-commit: 44c816a808198a38c3445c32614d4cef5d9f2736
Component: engine
2016-11-10 16:23:27 +01:00
Sebastiaan van Stijn
8bb2169ed5
Merge pull request #28186 from yongtang/27567-follow-up-dns-options
...
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: 33af4dd505aac709d607d26fc19a16d3dffdd66e
Component: engine
2016-11-10 16:20:17 +01:00
Vincent Demeester
fa835841f3
Merge pull request #28233 from erxian/update-network-ls-docs
...
update network ls docs to add SCOPE
Upstream-commit: c730a96454dc4098b2579e2f6093e6749b60be98
Component: engine
2016-11-10 16:16:13 +01:00
Vincent Demeester
becc27c95f
Merge pull request #28220 from tophj-ibm/test-killing-with-stop-signals
...
[integration-cli] fix race condition in kill tests
Upstream-commit: 7df0ed49d7f6e0cbcdef39dbae8900f882d785cb
Component: engine
2016-11-10 10:51:38 +01:00
Victor Vieux
6949dd3368
rename plugin manifest
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 49ca91fbebbea80587ce3c0814bba3b41cce14a0
Component: engine
2016-11-10 00:09:23 -08:00
Nishant Totla
58e0e2f371
Pin image by digest on service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 764a9ed357bca8fdccf1a794278463453f83f6ff
Component: engine
2016-11-09 23:31:26 -08:00
Victor Vieux
be247ad0fb
Merge pull request #28224 from vieux/fix_manpages
...
fix manpages
Upstream-commit: d286734b41cf3811021c5347412b8094638c0adc
Component: engine
2016-11-09 23:22:30 -08:00
erxian
3376796c8e
update network ls docs to add SCOPE
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 9410f4cc869a3f5f569d32741d1622f2d38a5207
Component: engine
2016-11-10 12:18:08 +08:00
Brian Goff
3d84cacc07
Merge pull request #28138 from dmcgowan/handle-overlay2-copy-up-bug
...
Use naive diff for overlay2 when opaque copy up bug present
Upstream-commit: a3b0ade34685f4f25875a0a485814d1acf373af3
Component: engine
2016-11-09 22:29:19 -05:00
Victor Vieux
34493b85fd
Merge pull request #28219 from darrenstahlmsft/WindowsConflictingOptions
...
Adding more strict resource checks on Windows
Upstream-commit: f7b27ded4ac7cdcea7015e9eb55c4529dec3970d
Component: engine
2016-11-09 18:01:03 -08:00
Victor Vieux
0f8fed3268
Merge pull request #28150 from AkihiroSuda/mounttmpcli
...
opts/mount: add tmpfs-specific options
Upstream-commit: 55543c45a20b38262b966548b05738260d67b065
Component: engine
2016-11-09 17:50:04 -08:00
Victor Vieux
62ec0be101
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
2016-11-09 17:49:51 -08:00
Victor Vieux
486562b02a
Merge pull request #27967 from aaronlehmann/encryption
...
Encryption at rest of manager keys and raft data
Upstream-commit: 18a07f599127f9aa6743de372f0384ffe31fd872
Component: engine
2016-11-09 17:49:26 -08:00
Victor Vieux
c27b5695c1
fix manpages
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8e701f0bd7f6be30d8b23010b2a7daf8e15981ec
Component: engine
2016-11-09 17:11:14 -08:00
Darren Stahl
828e14b6f7
Adding more strict resource checks on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 0ed00b36ff7d8651e4d11a41507f81441c081388
Component: engine
2016-11-09 16:29:54 -08:00