2c0a815816
Windows: Update TP5 refs in run_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 38faf6e04377e063b54da1f610802a54a88371d0
Component: engine
2016-11-23 14:28:06 -08:00
31a831b744
Merge pull request #28777 from Microsoft/jjh/fixtypo-bin-mounts
...
Fixes typo 'bin-mounts'
Upstream-commit: 6b12887c3e096affa2adef0736865b46c74d6c51
Component: engine
2016-11-23 14:04:03 -08:00
6e9dda554f
Fixes typo 'bin-mounts'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c8c1dfbaf3d4548bbf094c31ccaaf6858b33e6e0
Component: engine
2016-11-23 14:01:57 -08:00
ccbfa9c95a
Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy
...
Better error message on stack deploy when not a swarm manager
Upstream-commit: 205291c5f31eb0732aeb04c0489a6b6814afb905
Component: engine
2016-11-23 22:47:13 +01:00
154b3f0e4f
Restrict checkpoint name to prevent directory traversal
...
This fix tries to address the issue raised in 28769 where
checkpoint name was not checked before passing to containerd.
As a result, it was possible to use a special checkpoint name
to get outside of the container's directory.
This fix add restriction `[a-zA-Z0-9][a-zA-Z0-9_.-]+` (`RestrictedNamePattern`).
This is the same as container name restriction.
This fix fixes 28769.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c90ec0517544e7d054d79f71f4d24d9ebbad7408
Component: engine
2016-11-23 13:23:07 -08:00
f4499025ce
Windows: Case insensitive env vars
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b2049a84dee35308ca8c4837ccb9359f57808f45
Component: engine
2016-11-23 12:57:33 -08:00
f55bac29b6
Merge pull request #28760 from ehazlett/carry-28576
...
Update Secret Command help (carry #28576 )
Upstream-commit: ae64cae74e387f77b5d5a7b13d1abf0e084112b4
Component: engine
2016-11-23 12:29:55 -08:00
57d2ffce2e
28600: Docs: network connect for container in Created/Stopped state
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com >
Upstream-commit: 16c9cdad6fd7c78600e795cad03ec8b34cba0371
Component: engine
2016-11-23 20:20:37 +00:00
32d2829610
exit with status 1 if help is called on an invalid command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bb7601a3ffdc78bbe7efe7e77a196e09cf3607c7
Component: engine
2016-11-23 15:13:58 -05:00
e12f9af05e
COPY file . after WORKDIR (now always created)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 286ab6d69bb999f5fcbdfdcac50bb8d65bb50c56
Component: engine
2016-11-23 09:56:02 -08:00
641ac0f952
check err type
...
Signed-off-by: zteBill <bi.zhenkun@zte.com.cn >
Upstream-commit: 47b110a59295a2713fb18114f3afed7e2421d5e2
Component: engine
2016-11-24 01:33:02 +08:00
eca4c813dd
Merge pull request #28728 from aluzzardi/swarmkit-revendor-53fcdeba083627b1a2616612a103019b73c6d5ce
...
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Upstream-commit: 1640bb23b1127b76c4f0bf97bb265238b7574da9
Component: engine
2016-11-23 09:24:23 -08:00
41cced5c6d
Added and example of using --format with docker images
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Signed-off-by: William Henry <whenry@redhat.com >
Upstream-commit: 798c00a7eea731f7f70e7595c403db399d34924c
Component: engine
2016-11-23 10:15:19 -07:00
64466e9e79
Better error message on stack deploy against not a swarm.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c72daf953aaa8c7c8cbe60a103700d3b1d56c50d
Component: engine
2016-11-23 12:15:11 -05:00
f0d4bb09e7
Merge pull request #28765 from vdemeester/update-docker-info-docs
...
Update docker info cli reference documentation
Upstream-commit: 2c978bd9460a16fa04c219f729d6dabb6e43ebab
Component: engine
2016-11-23 17:27:08 +01:00
2555087edf
Merge pull request #28749 from runcom/remove-notneeded-unmarshal
...
daemon: remove not needed unmarshal
Upstream-commit: bbe1a7f84f889972d477acf069ad35b9dd4525d2
Component: engine
2016-11-23 17:22:23 +01:00
01461a6103
Update docker info cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d28eaa11710f2aa0429ccdc3dc7fd83c67f2775c
Component: engine
2016-11-23 17:20:12 +01:00
779c0a3651
Merge pull request #28753 from vdemeester/fix-userns-integration-cli
...
Fixes some integration-cli on userns
Upstream-commit: 6e8479bdfa719f6e5835425d26dc5bd0f6945697
Component: engine
2016-11-23 16:14:41 +01:00
99086026bc
update secret command
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: d87c91e39ff0d3defb5b98fdc9275c8c0bfc987e
Component: engine
2016-11-23 10:07:09 -05:00
8205b9e733
Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc
...
Update plugin enable cli reference documentation
Upstream-commit: 55cd9c4edc9b6ed912170e71c1e65bf1d3a3bba2
Component: engine
2016-11-23 15:53:02 +01:00
8cb287199f
Update plugin enable cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 43297dd6f81d85d1ac3dc49d68684404be0f2d8e
Component: engine
2016-11-23 15:42:40 +01:00
fe32007db0
Fix broken markdown in CHANGELOG.md
...
Signed-off-by: Masayuki Morita <minamijoyo@gmail.com >
Upstream-commit: 2ca39d27a689c709e3306df5a4eb255c81276574
Component: engine
2016-11-23 23:26:07 +09:00
160495ca21
Fixes some integration-cli on userns
...
Mainly adding requirements on Network or NotUserNamespace to make it pass.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: eb5fe064cfb8475e9f6fb9beac98ad6ce63be2a3
Component: engine
2016-11-23 14:03:53 +01:00
905aa6bfbb
daemon: remove not needed unmarshal
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 30b8712e93819b2da77e67e16f9c7b81fd3a0cb4
Component: engine
2016-11-23 12:53:25 +01:00
090bb3fe14
Move docker stack docs out of experimental
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bb96e18b19f78af38a9fe088b2873988ba9a47b4
Component: engine
2016-11-23 11:14:38 +01:00
c1c6b75097
update the secret command docs
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: c22821014a8d951d7028f9d2888072c4d9f7c593
Component: engine
2016-11-23 10:36:11 +08:00
82c68ee70f
Checking whether CG_MEM_SWAP is enabled at the current system session
...
Signed-off-by: CUI Wei <ghostplant@qq.com >
Upstream-commit: cd7496abb548f98c54d18f1282bc3e646593e1a6
Component: engine
2016-11-22 21:24:01 -05:00
9baf8e091f
Merge pull request #28455 from Microsoft/jjh/autogen
...
Windows: Native autogen
Upstream-commit: 5afdacb20ecbae338480a0382d62f7aabb6b9e8a
Component: engine
2016-11-22 18:18:12 -08:00
a06c9f4b07
Add some swarm encryption tests, and modify some existing ones, to test locking the whole cluster
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: be2603973d7aead5242dcdb9f916cdeedb3b6fa6
Component: engine
2016-11-22 20:56:45 -05:00
afb23f3459
Merge pull request #28716 from ehazlett/fix-multi-secret-inspect
...
Update secret inspect to support IDs
Upstream-commit: 7c6f001248cb6dffbffad4470caaa96e759cfe26
Component: engine
2016-11-22 17:39:48 -08:00
c10eac37c4
Merge pull request #28733 from thaJeztah/use-official-fedora25-image
...
Use official fedora 25 image
Upstream-commit: 0633c558bbb92836bd7061a21f00846085a6cdb4
Component: engine
2016-11-22 17:38:01 -08:00
9b69a300d4
Eliminate redundant parameters
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 58028a2919f1ee794a058fb3451a5145a6382b4d
Component: engine
2016-11-23 09:28:13 +08:00
7c90136733
Use official fedora 25 image
...
Fedora 25 was released today, and the official
image will be available soon.
This removes the temporary override, so that
we can build using the official image.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 545a2f009e5d99a196d1a328f4861207f8a99107
Component: engine
2016-11-23 02:19:02 +01:00
a8959c0a37
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 51247185a2c53854163276404a3438c9eb38c3b5
Component: engine
2016-11-22 17:01:02 -08:00
167591374d
Merge pull request #28683 from darrenstahlmsft/SystemDLL
...
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
Upstream-commit: 5c1826ec4de381df9f739ce0de28e37d4f734d47
Component: engine
2016-11-22 16:58:30 -08:00
e92b610690
Merge pull request #28727 from cyli/do-not-display-secret-digest
...
Do not display the digest or size of swarm secrets [1.13]
Upstream-commit: 22ba220e864d6d30ce1ed56a5461b96dbade844f
Component: engine
2016-11-22 16:44:06 -08:00
e746d79ff3
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
00fa4cf151
Update docs to reflect no longer displaying secret digest or size.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: fe127b7eae427bde96b7852ac196825e1c9ea359
Component: engine
2016-11-22 18:18:56 -05:00
2e3fe52bff
Do not display the digest or size of swarm secrets
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 2c0613540a25d45069d142542e572bb6338e4155
Component: engine
2016-11-22 18:13:27 -05:00
4d1ac89cc0
Swap usage of LazyDLL and LoadDLL to LazySystemDLL.
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 22c83c567f379dfd475ecd35665e1cc9e5b9c314
Component: engine
2016-11-22 14:57:11 -08:00
8236c4e19a
plugins: misc fixes
...
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6547609870b66f9dfb1894a4987c42608f856f3e
Component: engine
2016-11-22 14:32:07 -08:00
b38b87935c
Merge pull request #28726 from jacobtomlinson/docs-pull-concurrent
...
Document pull concurrent options
Upstream-commit: d145b0b93ffa6f828751c31ea9dd41a5a59e4c59
Component: engine
2016-11-22 23:11:27 +01:00
ee5ee81992
Add concurrent uploads/downloads section
...
Document and link to the concurrent uploads/downloads daemon option.
Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk >
Upstream-commit: b303381a4d679cad652c83f6b7d28cccbc06574c
Component: engine
2016-11-22 21:59:10 +00:00
53a64e3bc4
Merge pull request #26833 from cpuguy83/use_mounts_api_for_services
...
Use container Mounts API for Swarm containers.
Upstream-commit: 04155250492c3fd75d2e789b6d2355636c8cf766
Component: engine
2016-11-22 22:48:54 +01:00
08d6a8b3d7
Merge pull request #28691 from aluzzardi/service-logs-no-follow
...
[experimental] service logs: Support no-follow mode
Upstream-commit: c025d5650433de503f0b415b7b5e120cfcd35b17
Component: engine
2016-11-22 13:48:14 -08:00
dc5227ef8f
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
2016-11-22 22:47:38 +01:00
9e9aefeaf8
update secret inspect to support IDs
...
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets. This also cleans up the
help text for consistency.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 70d2cefd51e853ca4f3bbf8eb0386360809e026b
Component: engine
2016-11-22 16:01:16 -05:00
2b83a1645f
Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.3.7
Upstream-commit: 61d9ba930ccf13a39d56f922798695819d239683
Component: engine
2016-11-22 21:35:45 +01:00
c76f65bd98
Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE
...
Ensure vmcompute.dll exists during daemon start
Upstream-commit: 9d0050727d8cc9df8654e312eb53e09c6bca1140
Component: engine
2016-11-22 21:31:45 +01:00
4c1ce8ff4b
Merge pull request #28698 from YuPengZTE/devErrot
...
error strings should not be capitalized or end with punctuation
Upstream-commit: 86eae4018a06c0291f9572cd7f062f320b612698
Component: engine
2016-11-22 21:25:09 +01:00
John Howard
Alexander Morozov
Vincent Demeester
Yong Tang
Victor Vieux
dattatrayakumbhar04
Daniel Nephin
zteBill
William Henry
Sebastiaan van Stijn
erxian
Masayuki Morita
Antonio Murdaca
Harald Albers
cuiwei13
cyli
Yanqiang Miao
Sebastiaan van Stijn
Andrea Luzzardi
Tõnis Tiigi
Anusha Ragunathan
Darren Stahl
Tibor Vass
Jacob Tomlinson
Evan Hazlett