p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,801 Commits 2 Branches 295 Tags
d5ff009b237e63fefaa60002d73c86c8d7062460
Commit Graph

28801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
d5ff009b23 Implement ipamconfig.subnet and be more explicit about restart policy always. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dfd1227906a74acd51daed906802424299bda3bc
Component: engine
 2016-11-10 16:22:31 -05:00
Daniel Nephin
4c746a53ae Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef90081d44f204727254c4ae5f0b4910a77530fd
Component: engine
 2016-11-10 12:37:17 -05:00
Daniel Nephin
80cefc6683 Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bd8de8d8be9e367af9e045d0fdead4462fed490c
Component: engine
 2016-11-10 11:28:19 -05:00
Aanand Prasad
f16c51a10e Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: aa5e7d038a5459df55f5c039d4a881a4558aa247
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
3a6b62c164 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: eefccc25c5cda96947978c503d5764aa48aacd7d
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
2d56062821 Remove bundlefile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b45581b78610e9fe41b8fde19188868aac6df250
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
184722486c Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 46ca5827f99e627d7b63433497aee145c1d0468e
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
36eb40263d Always use a default network if no other networks are set. 
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 644d30369a348db4d904d86958c2b57a0de36990
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
1908145b38 Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b0efbcc34a77d5d8869cc381064d3741b67f9776
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
787c19b18c Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 3d2cb23782da72f650da438b11d4db87ccdbb596
Component: engine
 2016-11-10 11:28:18 -05:00
Vincent Demeester
38597e8d2b Fix hostname support for compose file 
Pass the hostname from ContainerSpec to the actual container.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d0117238fa74ea75cdec7b9205620c59bafc4508
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
15d5c8d4af Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: fcad58f3c85145f0414ffba72321bbb10d16e272
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
941e9ca594 Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 13384ba34b8d57d9cc6e68ff9c8b0b72bc72f9c3
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
860efa419b Add support for service-level 'volumes' key 
Support volume driver + options
Support external volumes
Support hostname in Compose file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 0884e3c86892a0f51b8feeeb30ff486c821796f5
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
52cbc60fd5 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cbbc6b4d9bd50f7409c6d935efc899946c449de3
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
2885f048a3 Vendor dependencies for compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ed35648151453f71dc59dc5c971ce132ebbc77c9
Component: engine
 2016-11-10 11:28:18 -05: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
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Aaron Lehmann
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Sebastiaan van Stijn
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
Victor Vieux
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
Jana Radhakrishnan
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
Anusha Ragunathan
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
Victor Vieux
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
Christopher Jones
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
Christopher Jones
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
Tibor Vass
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
Vincent Demeester
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
Santhosh Manohar
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
Sebastiaan van Stijn
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
Derek McGowan
5656296e4b Use naive diff for overlay2 when opaque copy up bug present 
When running on a kernel which is not patched for the copy up bug
overlay2 will use the naive diff driver.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 64b43ed5ecf3e805bd72bd6a9493c8c5d08478aa
Component: engine
 2016-11-09 13:42:10 -08:00
Brian Goff
19713269e4 Merge pull request #28215 from dnephin/validate-swagger-gen 
Add validate/swagger-gen
Upstream-commit: 9e2d4f91d49a409acb07b06b0d0fe6fb205f608e
Component: engine
 2016-11-09 16:39:22 -05:00