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
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
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
5a0f28bcec
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
...
Signed-off-by: Avi Vaid <avaid1996@gmail.com >
Upstream-commit: 570bad1974e767525ef513e48a0df19fc8b49e0c
Component: engine
2016-08-04 15:07:20 -07:00
bcd928c83a
Merge pull request #23902 from dnephin/inspect-to-cobra
...
Convert inspect command to Cobra
Upstream-commit: 979d48bbf58599ecf236984463ae94ee59ba3b47
Component: engine
2016-08-04 11:20:43 -07:00
5820821c40
Merge pull request #25370 from thaJeztah/move-experimental-test
...
Move TestInspectNamedMountPoint integrationtest from experimental
Upstream-commit: af51c9704c058f5a6545a6e5a27d7797f4cadab5
Component: engine
2016-08-04 11:12:46 -04:00
d43047d4a6
Docker api inspect Assert HostConfig
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 86c72aa01fe55af3abefe98cd4d6d36ab2dd3217
Component: engine
2016-08-04 23:01:16 +08:00
652ecddc04
Refactor dockerCli *Format to ConfigFile call
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7c8780ea6327b1d403b13c8b144d9557b5e655e5
Component: engine
2016-08-04 15:00:00 +02:00
b837103bde
Add volume --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a488ad1a090eb0b6069f79cd045badaaa8ec1bda
Component: engine
2016-08-04 14:59:55 +02:00
33375755ad
Add network --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a8aaafc4a3fc716bdb2c4e571e34c66eb80bbab2
Component: engine
2016-08-04 14:59:51 +02:00
5f35a9dc5e
Refactor api/client/formatter files
...
- Create container.go and image.go for specific context code
- Keep common code in formatter.go and custom.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e4fdbbc00bf90c5d9f87885b0c8ecd7f1d200921
Component: engine
2016-08-04 14:59:45 +02:00
7ffe9a911c
Fatal info not identical with actual chmod intent
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: bd0ec7ed55a9ec2cd5957e9a9ac3542a9d218dcc
Component: engine
2016-08-04 20:14:15 +08:00
a86adb0e9c
Fix Markdown formatting in API docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 33bd963cfb9396b74387f6f17dc6e86b2ca5fa9d
Component: engine
2016-08-04 14:13:30 +02:00
e9fa1f29b7
Fix service ps output format in swarm tutorial
...
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io >
Upstream-commit: da56fa26990aa957c9bdc5497b9856f8aff58636
Component: engine
2016-08-04 13:01:22 +03:00
3ce44cb403
Merge pull request #25391 from sdurrheimer/zsh-completion-node-rm-force
...
Add zsh completion for 'docker node rm --force'
Upstream-commit: 402cf238bf3da16a7b04ec2b911ca6a2097fa285
Component: engine
2016-08-04 10:14:30 +02:00
b9fed96c04
Merge pull request #25384 from vieux/fix_wait_plugins
...
fix deadlock when more than 1 plugin is installed
Upstream-commit: 5de2e6d7b8494e662a7b53c287dad25bc6139747
Component: engine
2016-08-04 08:46:57 +02:00
e94630e5b6
Merge pull request #25385 from crosbymichael/test-improvements
...
Test improvements to reduce time for long running tests
Upstream-commit: 73c597e5f216e84e5c0d7738c20c4134b225901b
Component: engine
2016-08-04 08:44:32 +02:00
ba54cb627c
Add zsh completion for 'docker node rm --force'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b58ef479a6be7ddff79a354ee912f9dd73a9f41b
Component: engine
2016-08-04 08:01:04 +02:00
c1636749f7
libcontainerd: mark container exited after failed restart
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9be0fb45c25e4d8d3cf0aa444da5ae41dd18f435
Component: engine
2016-08-03 17:44:30 -07:00
3ef890484a
fix deadlock when more than 1 plugin is installed
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 42360d164b9f25fb4b150ef066fcf57fa39559a7
Component: engine
2016-08-03 16:22:12 -07:00
51a2e7806a
Merge pull request #25309 from cpuguy83/25253_fix_accidental_bind_create
...
Validate mount paths on task create
Upstream-commit: e10f6a2e549cda2d4f8fc7ee23c91dc7a21bb967
Component: engine
2016-08-03 15:54:03 -07:00
3eeb6b8c6e
libcontainerd: wait for restart after state change
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 495448b2903c1a765cc17dff05afebe16a466917
Component: engine
2016-08-03 15:28:07 -07:00
