15fecb0bf3
More helpful error message when not sufficiently argumentative
...
The error message suggests you need one argument even when you
have provided one. Suggest having another argument.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 4ce93940b7c2a640c94296f20352cf6f052d1028
Component: engine
2016-08-08 17:22:09 +01:00
63356b5588
Merge pull request #23718 from yongtang/23498-entrypoint-unset
...
Allow unset `--entrypoint` in `docker run` or `docker create`
Upstream-commit: 2684459ed433125257ffde5e95666ff785f26ec2
Component: engine
2016-08-08 14:38:01 +02:00
91b4797af0
Merge pull request #25479 from lixiaobing10051267/masterThey
...
Fix typo for docker swarm description
Upstream-commit: 02ca34bc307215fff50a89a13cd9d695bd9bc9d4
Component: engine
2016-08-08 12:05:40 +02:00
8b07fc75ff
Fix typo for docker swarm description
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: eb4b965ddbe0c351df45dfd81b32c08c7194d804
Component: engine
2016-08-08 14:47:15 +08:00
3b72d892d5
modify func namt from TestUserAgentPassThroughOnPull to TestUserAgentPassThrough
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 427869fe94c9d32daa29f964bbf4371bf2295748
Component: engine
2016-08-08 11:40:20 +08:00
c733ccf2f5
Cleanup manpage container in build process
...
When running a `make manpages` the image `docker-manpage-dev` will be build and started to create
the man pages. But the container will not be deleted afterwards. So I propose to start it with
`docker run --rm ...`, otherwise we'll collect some trash.
```
$ docker ps -a
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
e3d9f721d862 docker-manpage-dev "man/generate.sh" 19 minutes ago Exited (0) 16 minutes ago berserk_jang
5738a23fb682 docker-manpage-dev "man/generate.sh" 9 hours ago Exited (0) 9 hours ago boring_bartik
15490b5e63f7 docker-manpage-dev "man/generate.sh" 10 hours ago Exited (0) 10 hours ago lonely_joliot
```
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 12c10239bbff1def439193d4681464640446bfbb
Component: engine
2016-08-06 10:20:16 +02:00
a9989e0c56
Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide
...
add force remove to admin guide, clean up usage of Raft, cluster -> s…
Upstream-commit: 59b03240b17d5c1fdd18e629e614dc5cffc6c536
Component: engine
2016-08-06 09:16:23 +02:00
f1599dae94
Merge pull request #25455 from abronan/improve_cli_promote_demote_output
...
swarm: improve cli output on node promote/demote for unchanged role
Upstream-commit: 8615c8b52da0a9dfdd51f1e66f76f09d3db5defa
Component: engine
2016-08-06 09:12:46 +02:00
48383b5b93
Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo
...
fix typo, change sample cert expiry value
Upstream-commit: e62b9450136595ac73b4fd0de766d072c1a6954a
Component: engine
2016-08-06 09:10:12 +02:00
6d724fc98c
Merge pull request #23725 from yongtang/23528-journald-sanitize
...
Sanitize docker labels when used as journald field names
Upstream-commit: 5659b1f18117db38d6cfbe26b0a587901898968a
Component: engine
2016-08-06 09:04:54 +02:00
8efb4bf7c6
Merge pull request #25442 from albers/completion--env
...
Fix bash completion for `docker service {create,update} {-e,--env}`
Upstream-commit: b72a41b32e683a9d4cb780e3f937e4959447ece0
Component: engine
2016-08-06 10:47:18 +08:00
7a49d47322
add force remove to admin guide, clean up usage of Raft, cluster -> swarm, fix some organization
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 6c38e6877aa4cfddee018a5bdfee6a9bbcbcc646
Component: engine
2016-08-05 17:27:10 -07:00
17d93be307
Merge pull request #25454 from dave-tucker/bug/25453
...
cli: service inspect - Null check for UpdateConfig
Upstream-commit: 29dfdeed72fad096a3a3e01602f63ef58b719e82
Component: engine
2016-08-05 17:20:08 -07:00
faec4a3727
fix typo, change sample cert expiry value
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 8e53390b5101ae30a13fc40f2c2a52019f8b4906
Component: engine
2016-08-05 16:51:07 -07:00
0c71c314fa
Update documentation for entrypoint unset with docker run/create
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 26c913cb6054236e2df5b4a1fcdc5708c4be8f4c
Component: engine
2016-08-05 16:35:25 -07:00
0c94d9d1e8
Allow unset --entrypoint in docker run or docker create
...
This fix tries to address the issue raised in #23498 to allow unset
`--entrypoint` in `docker run` or `docker create`.
This fix checks the flag `--entrypoint` and, in case `--entrypoint=` (`""`)
is passed, unset the Entrypoint during the container run.
Additional integration tests have been created to cover changes in this fix.
This fix fixes #23498 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c8d3ee80933d6337382fb4a52d90835e263c1aaf
Component: engine
2016-08-05 16:35:20 -07:00
9d14a49a6b
swarm: improve cli output on node promote/demote for unchanged role
...
As of now promoting (or demoting) a node that has its role
left unchanged will always print a successful message.
This PR fixes the issue by matching the behavior on swarmkit's
swarmctl command and printing a message when desired role is
the current role of the node.
As a result this also avoids calling update when it is not
necessary.
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
Upstream-commit: 5479df79c7859d5a09f42c22ddb5fa3e56ceeb7c
Component: engine
2016-08-05 15:51:32 -07:00
c892df89ab
Sanitize docker labels when used as journald field names
...
This fix tries to address the issue raised in #23528 where
docker labels caused journald log error because journald
has special requirements on field names.
This fix addresses this issue by sanitize the labels per
requirements of journald.
Additional unit tests have been added to cover the changes.
This fix fixes #23528 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9528ea930cdb90f906230a6d4cab179001255927
Component: engine
2016-08-05 15:20:47 -07:00
24a1ece9dc
cli: service inspect - Null check for UpdateConfig
...
Fixes #25453
Signed-off-by: Dave Tucker <dt@docker.com >
Upstream-commit: 0e1fe4516fc7af03259753f6d264e91d11fe4d1a
Component: engine
2016-08-05 22:42:14 +01:00
0c4a3deec0
Merge pull request #25072 from mlaventure/oos-libcontainerd-client
...
Handle out-of-sync libcontainerd client on restore
Upstream-commit: 6401bd65b11931a27a6d2e1d3b6a9278ed4e8fc7
Component: engine
2016-08-05 14:23:25 -07:00
ed50f67ff9
Merge pull request #24703 from jhorwit2/jah/#24696
...
Fixes #24696 - Fixes Size showing 0 in formatted ps output
Upstream-commit: 049210ce46f4929257e18e8c33fec6eda5366c10
Component: engine
2016-08-05 21:28:45 +02:00
293fa410c5
Merge pull request #24948 from dnephin/support-iterative-integration-testing
...
Support running integration tests without restarting a daemon
Upstream-commit: 8a81986a583a9e1a146931373608fbff378d09a2
Component: engine
2016-08-05 14:23:24 -04:00
f00255fe74
Merge pull request #25447 from albers/completion-swarm-interfaces
...
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
Upstream-commit: 54e2cbc11e956863413859f492194a3dfcdd5646
Component: engine
2016-08-05 19:59:32 +02:00
32be738fe0
Merge pull request #25090 from swernli/rootfs-cleanup
...
Removing old custom RootFS behavior on Windows.
Upstream-commit: 6c07fbd455cef4a5bda34ced4f0364639667db4d
Component: engine
2016-08-05 10:55:44 -07:00
25b29d1992
Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
...
Fix bash completion for `docker swarm join --advertise-addr`
Upstream-commit: e9bfb9b4cbec2b3e7120a2775b74a7c4e3088397
Component: engine
2016-08-05 13:50:26 -04:00
44fa57fb1b
Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
...
Enable to dynamically reload authorization plugins via daemon.config
Upstream-commit: b2b3cb7be92b97150c9be96c606c0ab0a383d2ec
Component: engine
2016-08-05 19:38:40 +02:00
309dacda0b
Merge pull request #25444 from albers/completion-node-inspect-self
...
Add `self` to bash completion of `docker node inspect`
Upstream-commit: 5605510bb6057b0dcdd5bd57b936f69251488723
Component: engine
2016-08-05 13:21:01 -04:00
1e65234473
Fix bash completion for docker swarm join --advertise-addr
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fa1b82e5ebc0e7dafe500e891c8b8c5fe5d4e1aa
Component: engine
2016-08-05 19:14:13 +02:00
e192b700cb
Merge pull request #25383 from tonistiigi/fix-restart-err
...
Fix possible race on container restart and restart error handling
Upstream-commit: c1e019585773f92b3300070283701811980a64c7
Component: engine
2016-08-05 13:12:17 -04:00
a4f26f26fe
Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 07f6655286f5e383dba5063bf0dcf2ee02d5e52f
Component: engine
2016-08-05 18:56:17 +02:00
25e106a620
Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory
...
update D4M D4W advisory in swarm tutorial
Upstream-commit: e4bca493568c2b67bb45fc488cf7c8a81d55e3d3
Component: engine
2016-08-05 18:37:35 +02:00
8e64c9c8ad
Merge pull request #24434 from AkihiroSuda/fixMakeInstall
...
make install: install runc and containerd
Upstream-commit: 430a234a5b0b664f3f047f83ef0b843ee7ebb3cf
Component: engine
2016-08-05 09:34:21 -07:00
7ad5ac8d06
update D4M D4W advisory in swarm tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: bd15725519453b13802f1b94f2d61ec04b73d266
Component: engine
2016-08-05 09:13:39 -07:00
aa2e0abc3e
Support interactive integration testing.
...
Interactive integration testing is useful when you're developing new tests, or
making changes to cli code.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1d945a9743748373cd5c5bfface3209d241007d7
Component: engine
2016-08-05 12:07:28 -04:00
fe75792b8d
Add self to bash completion of docker node inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b63a7692d6c656cfa1081e36de7be690fd007385
Component: engine
2016-08-05 18:06:25 +02:00
6a3509b302
Sync API docs
...
This synchronizes formatting changes to older
versions of the API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5696c47470a3163d70b3518657f88534787e9fc3
Component: engine
2016-08-05 17:44:58 +02:00
0aa5d77457
Merge pull request #25405 from thaJeztah/fix-api-markdown
...
Fix Markdown formatting in API docs
Upstream-commit: 66671d4ec29d7ccbd991399b8b98705e57b6a3eb
Component: engine
2016-08-05 17:44:15 +02:00
6020e85931
Merge pull request #25402 from lixiaobing10051267/masterChmod
...
Fatal info not identical with actual chmod intent
Upstream-commit: 4c528ae7199191955a8294764fdb5eefaa664841
Component: engine
2016-08-05 08:42:30 -07:00
fd0981c83c
Fix bash completion for docker service {create,update} {-e,--env}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 197f23da497d3d82f30beb6d920211f6d2055fa3
Component: engine
2016-08-05 17:41:40 +02:00
d006708306
Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls
...
Add format flag to network and volume ls
Upstream-commit: 1ccd9d31372c41aaac5bc9972122348b1007ea14
Component: engine
2016-08-05 15:17:45 +02:00
823b6241c7
Merge pull request #25387 from yongtang/25374-ps-filter-order
...
Sort output of `docker ps --filter` with order by creation time
Upstream-commit: 29fef34139a4be9235a245a85e98c8a3b9432f2d
Component: engine
2016-08-05 14:47:10 +02:00
fb8eea7ff0
Merge pull request #25096 from vieux/docker_plugin_remove_force
...
Add --force to docker plugin remove
Upstream-commit: 85428a1a53292684be55de9de3646e8c4745c72e
Component: engine
2016-08-05 14:45:05 +02:00
f5cba7815d
Merge pull request #25435 from kfr2/fix-run-docs-typo
...
Fix typo in run command documentation
Upstream-commit: 0af3ca6933cccae7fc12cd76dd2ec858bd469eb8
Component: engine
2016-08-05 14:19:22 +02:00
eee1f8867e
Merge pull request #25279 from aboch/auto
...
Only consider netlink "device" interfaces in address autodetection on Linux
Upstream-commit: acbac04c4bddb6861155ebdb28df1c19b50e5bdc
Component: engine
2016-08-05 14:13:53 +02:00
58b42febf4
Merge pull request #25401 from lixiaobing10051267/masterConfig
...
Docker api inspect assert HostConfig
Upstream-commit: f570fbb9ba14ba9ce5725cf51e1c4360dcb6d179
Component: engine
2016-08-05 14:11:29 +02:00
74f20fa606
Fix typo in run command documentation
...
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co >
Upstream-commit: b3913024e252e9cb1e7cba75e3f95cb23cedaf9b
Component: engine
2016-08-05 07:35:16 -04:00
7c2f803204
Remove git conflict markers
...
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com >
Upstream-commit: 34278b3301c0ca339d32a90264f0018e35a1e7e9
Component: engine
2016-08-05 09:41:45 +02:00
87b0575d6c
Sort output of docker ps --filter with order by creation time
...
This fix tries to address the issue raised in 25374 where the
output of `docker ps --filter` is in random order and
not deterministic.
This fix sorts the list of containers by creation time so that the
output is deterministic.
An integration test has been added.
This fix fixes 25374.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 3f971335463b99a7caedcf597ffc544845b37a21
Component: engine
2016-08-04 19:27:50 -07:00
4183fa25d5
Remove "-rc" from documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
2016-08-05 01:38:18 +02:00
d5f439ee89
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
2016-08-04 15:55:45 -07:00
