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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
be247ad0fb
Merge pull request #28224 from vieux/fix_manpages
...
fix manpages
Upstream-commit: d286734b41cf3811021c5347412b8094638c0adc
Component: engine
2016-11-09 23:22:30 -08:00
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
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
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
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
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
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
c27b5695c1
fix manpages
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8e701f0bd7f6be30d8b23010b2a7daf8e15981ec
Component: engine
2016-11-09 17:11:14 -08:00
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
c4b7cbe0fb
Document autolock/unlock/unlock-key
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 824db2c4543f912c1fdf392ebbaefa5540bc88a4
Component: engine
2016-11-09 16:12:11 -08:00
f3d621f988
Lock/unlock integration tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c3c70c4bcd775d20e2d4a4989733f7ad6b2b90b2
Component: engine
2016-11-09 16:09:01 -08:00
2394a196a1
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
2016-11-09 16:09:01 -08:00
0827ead1b6
Revise swarm init/update flags, add unlocking capability
...
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
2016-11-09 16:09:00 -08:00
6a03ee3d4e
Add integration tests for encrypted swarm
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8b1f72ad44f03d4786cb3e881b480c94a143885f
Component: engine
2016-11-09 16:09:00 -08:00
2874df7efa
Add support for swarm init lock and swarm unlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
2016-11-09 16:09:00 -08:00
f5437c0d78
vendor: update errors to 839d9e91
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 472ecae0d801f71d8b44f4ca7a9fff0b9271799f
Component: engine
2016-11-09 16:09:00 -08:00
1e77cc5379
vendor: update swarmkit to bddd3f0
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
75a25a369f
Merge pull request #27915 from rhvgoyal/graph-create-opts
...
Pass all graphdriver create() parameters in a struct
Upstream-commit: f11ac963af5a94ae0c36aaa2a67a671c6a313e59
Component: engine
2016-11-10 01:07:41 +01:00
174f2a0d72
Merge pull request #28025 from vdemeester/swarm-mode-templating
...
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
2016-11-09 15:57:52 -08:00
3e9922773f
Merge pull request #28078 from sanimej/inspect
...
Show peer nodes in network inspect for swarm overlay networks
Upstream-commit: 5ef5a4216a83421122461c90b7aa1ca1d709c4c8
Component: engine
2016-11-09 15:33:13 -08:00
948055475e
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
2016-11-09 15:23:03 -08:00
a16c95482f
Merge pull request #28212 from crosbymichael/tini-deps
...
Add tini deps for deb and rpm
Upstream-commit: 75091abe76531d4373aba2da680b695e5dbb8fc8
Component: engine
2016-11-09 15:20:58 -08:00
9bafbfb322
Add restart policy to restart policy tests
...
Fixes two tests that tested containers restart policy without
actually having a restart policy
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: de1dad7074c84f56dd8f29bca0de29ba1e4ae6ce
Component: engine
2016-11-09 17:13:42 -06:00
4d951615ba
[integration-cli] fix race condition in kill tests
...
Fixes a race condition in the kill tests where the container
would be killed but inspected before it's state changed. Fixes
this by waiting for a state change instead.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: ff42a1ab5348944c6d675575b00959b87b2c4032
Component: engine
2016-11-09 17:00:01 -06:00
e85707f736
Merge pull request #28002 from Microsoft/jjh/noreexec
...
Windows: Allow a no-reexec option for importLayer
Upstream-commit: 5e3d777401cd96bd9958971533222726edb1caa5
Component: engine
2016-11-09 14:46:21 -08:00
9549c6b9d6
Add support for swarm mode templating
...
Wire templating support of swarmkit for the engine, in order to be used
through services.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
2016-11-09 23:28:06 +01:00
6c7506b25f
Show peer nodes in network inspect for swarm overlay networks
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: dd9944aa644c717009a85ab85e00894ef3d3b20f
Component: engine
2016-11-09 13:58:04 -08:00
44e382058d
Merge pull request #28214 from albers/completion-for-28196
...
Add bash completion for `docker {node rm,swarm leave} -f`
Upstream-commit: 9482da362c63e45d4f0ae4d43bb7ef0c4a7b2fd8
Component: engine
2016-11-09 22:56:22 +01:00
