ac43a15799
Add a short flag for docker stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f1dd721b6978f1c24bb2761b88c83d9e385bd781
Component: engine
2016-11-25 13:23:36 -05:00
187f270db7
Merge pull request #28794 from yongtang/28786-docs-network-ls-dangling
...
Update docs of `docker network ls --filter`
Upstream-commit: 03ba9a4922237cde481249fb5d58ec3c26a22b47
Component: engine
2016-11-24 19:16:57 +01:00
50e0ca5a47
Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message
...
Improve error when connecting service to network
Upstream-commit: 8602d97835a1cb99943ca22c76d147944953f86a
Component: engine
2016-11-24 09:06:51 -08:00
6bc43aa829
Update docs of docker network ls --filter
...
Currently the help output of `docker network ls --filter` is:
```
Options:
-f, --filter value Provide filter values (i.e. 'dangling=true') (default [])
...
```
This caused confusion as only the following filters are supported at the moment:
- `driver`
- `type`
- `name`
- `id`
- `label`
This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
-f, --filter filter Provide filter values (i.e. 'driver=bridge')
...
```
This fix fixes 28786.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 2510f254eea58788c1a98987db35294beb839bb4
Component: engine
2016-11-24 08:14:36 -08:00
1e88e0afbe
Merge pull request #28803 from ijc25/check-config-legacy-vsyscall
...
check-config check for LEGACY_VSYSCALL_* options
Upstream-commit: 82c858c8b6d631c34377e201eed18c1473bbaba7
Component: engine
2016-11-24 08:10:27 -08:00
20b421de44
Merge pull request #28772 from yongtang/28769-checkpoint-id-name-check
...
Restrict checkpoint name to prevent directory traversal
Upstream-commit: ab397c95e6b872dc7575c693ea4dbd0041ef547b
Component: engine
2016-11-24 17:09:01 +01:00
0026f3bb52
Merge pull request #28802 from yuexiao-wang/fix-cli-typo
...
Add options for docker plugin enable and fix some typos
Upstream-commit: 7aae360c413162d0886170a096b80a9a9e937c9e
Component: engine
2016-11-24 17:03:56 +01:00
7de409be5f
Add options for docker plugin enable and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9e414bfa6b26bf919fc7ffbf0cf87814043b328b
Component: engine
2016-11-25 04:07:06 +08:00
64b693348d
Improve error when connecting service to network
...
The error didn't hint at how to resolve it. Google auto-suggest
also implies that people have been Googling this error.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 70acb89fa2e889393d33664bc780cf116795f3e4
Component: engine
2016-11-24 14:43:24 +00:00
08f496b922
Merge pull request #28800 from lixiaobing10051267/masterState
...
Fix some output information for container test
Upstream-commit: 0f79746f3d2aa7b13ed2e527279791cfe701363e
Component: engine
2016-11-24 06:21:07 -08:00
92d40c923d
Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc
...
28600: Docs: network connect for container in Created/Stopped state
Upstream-commit: b3687bdcdc9e52a1cc154648262c69939d8633df
Component: engine
2016-11-24 15:04:53 +01:00
0898ad43d6
Fix some output information for container test
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 92ee5a5d3aaefe2fc3b800de67d2ff0acd6a8aae
Component: engine
2016-11-24 20:01:00 +08:00
ced837f499
Check for LEGACY_VSYSCALL_* options
...
Chosing LEGACY_VSYSCALL_NONE (over NATIVE or EMULATE) will mean that binaries
using eglibc <= 2.13 will not run (segfault).
Fixes #28705 .
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
Upstream-commit: 163db04452fe399fec940a926733915e7cf90062
Component: engine
2016-11-24 11:39:05 +00:00
8d1d4dee5b
Merge pull request #28757 from minamijoyo/fix-broken-markdown-in-changelog
...
Fix broken markdown in CHANGELOG.md
Upstream-commit: e47ca825d18655851118b12f912ff38bbf285768
Component: engine
2016-11-24 02:05:03 +01:00
af76bb22e4
Merge pull request #28773 from dnephin/exit-status
...
exit with status 1 if help is called on an invalid command
Upstream-commit: 32229914c736a6b9f13d1eff5330304f2a39282f
Component: engine
2016-11-23 15:13:29 -08:00
b3ff5acf26
Merge pull request #28667 from Microsoft/jjh/env-case-sensitive
...
Windows: Case insensitive env vars
Upstream-commit: f93c04d1ed8bfe21d3aa962ed81ebaaf19d60451
Component: engine
2016-11-23 14:40:16 -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
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
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
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
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
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
