Akihiro Suda
ec8b286dd3
Merge pull request #29391 from lixiaobing10051267/masterTypeWin
...
fix some typos in libcontainer\types_windows.go
2016-12-15 13:26:58 +09:00
Victor Vieux
9a30560fda
Merge pull request #29413 from albers/completion-deploy-experimental
...
Make bash completion for `docker stack deploy --bundle-file` available only in experimental mode
2016-12-14 17:24:50 -08:00
Tibor Vass
ba368baea1
Merge pull request #29156 from aaronlehmann/trusted-service-create
...
Content trust for swarm services
2016-12-14 16:04:50 -08:00
Phil Estes
8415aeb39a
Merge pull request #29366 from unclejack/pkg_return_directly
...
pkg: return directly without ifs where possible
2016-12-14 21:20:26 +01:00
Anusha Ragunathan
738769d23c
Merge pull request #29380 from vieux/skip_empty_network_plugin
...
skip empty networks in plugin install
2016-12-14 11:53:42 -08:00
Aaron Lehmann
62cd3b39f9
integration-cli: Add integration tests for swarm services + content trust
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:50:23 -08:00
Aaron Lehmann
d4d6f8c0d0
cli: Pin image to digest using content trust
...
Implement notary-based digest lookup in the client when
DOCKER_CONTENT_TRUST=1.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:49:33 -08:00
Aaron Lehmann
4b8c79f25e
cli: Split out GetNotaryRepository and associated functions
...
Split these into cli/trust so that other commands can make use of them.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:49:32 -08:00
Kenfe-Mickaël Laventure
b6f870a278
Merge pull request #29387 from vicamo/add-debian-security-updates-when-available
...
mkimage: add debian security updates source when available
2016-12-14 09:54:50 -08:00
Sebastiaan van Stijn
2fe62f2395
Merge pull request #28943 from vdemeester/publish-long-short-syntax
...
Remove --port and update --publish for services to support syntaxes
2016-12-14 17:55:48 +01:00
Harald Albers
a53bdfa3be
Make bash completion for docker stack deploy --bundle-file experimental
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-14 08:52:07 -08:00
You-Sheng Yang (楊有勝)
e2e5d4bc9d
mkimage: add debian security updates source when available
...
Signed-off-by: You-Sheng Yang (楊有勝) <vicamo@gmail.com>
2016-12-14 23:23:00 +08:00
Sebastiaan van Stijn
2333af9e59
Merge pull request #29382 from yuexiao-wang/fix-wait-man
...
Update the manual for docker wait
2016-12-14 15:29:33 +01:00
Vincent Demeester
1474a451b1
Merge pull request #29401 from bfirsh/add-swagger-display-name
...
Add display name for tags in swagger.yaml
2016-12-14 15:28:22 +01:00
Brian Goff
c856c0c777
Merge pull request #29078 from bfirsh/add-swagger-docs
...
Add make command for previewing API docs
2016-12-14 08:42:35 -05:00
Ben Firshman
27ca33e965
Add make command for previewing API docs
...
Much easier than the previous method of copying over to the docs
repository and generating the docs.
And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-12-14 12:27:32 +00:00
Ben Firshman
0caa6c218c
Add display name for tags in swagger.yaml
...
In #29071 , we made the tags the correct name for generating types,
at the expense of the menu in the documentation looking good.
ReDoc now has support for tag display names
( https://github.com/Rebilly/ReDoc/pull/152 ), so we can assign
a more human-friendly name to the menu items.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-12-14 12:00:04 +00:00
yuexiao-wang
303ff807f2
Update the manual for docker wait
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-14 18:22:59 +08:00
lixiaobing10051267
f385846d6f
fix some typos in libcontainer\types_windows.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-14 16:33:03 +08:00
Tibor Vass
98fef1cb0b
Merge pull request #29374 from mavenugo/exp
...
Add the missing experimental ipvlan network driver
2016-12-13 20:03:24 -08:00
Tibor Vass
af50cefe6c
Merge pull request #29008 from cpuguy83/refcount_graphdriver
...
Refcount graphdriver plugins properly
2016-12-13 19:24:46 -08:00
Aaron Lehmann
96f7fedc1e
Merge pull request #29198 from allencloud/return-no-swarm-when-unlock-normal-node
...
return node is not a swarm when unlock a normal node
2016-12-13 18:59:06 -08:00
Victor Vieux
04e35a01fc
skip empty networks in plugin install
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-13 17:46:01 -08:00
Victor Vieux
e23c5fcdbb
Merge pull request #29283 from cpuguy83/fix_plugin_live_restore
...
Fix issues with plugin and `--live-restore`
2016-12-13 17:11:59 -08:00
Madhu Venugopal
b0eef4e427
Pass daemon experiemental flag to libnetwork
...
Required to enable ipvlan experimental network driver
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 14:22:54 -08:00
Madhu Venugopal
8e6969d846
Vendor libnetwork with experimental daemon flag handling
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 14:22:48 -08:00
Brian Goff
cb6633175c
Fix issues with plugin and --live-restore
...
Fixes an issue when starting the daemon with live-restore
where previously it was not set, plugins are not running.
Fixes an issue when starting the daemon with live-restore, the plugin
client (for interacting with the plugins HTTP interface) is not set,
causing a panic when the plugin is called.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-13 16:11:59 -05:00
Vincent Demeester
5665c73642
Merge pull request #29288 from Microsoft/jjh/promptusestdin
...
Windows: Prompt fix use regular stdin
2016-12-13 21:18:54 +01:00
unclejack
418e612383
pkg: return directly without ifs where possible
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-12-13 22:10:11 +02:00
Arnaud Porterie
39473dad54
Merge pull request #29349 from vdemeester/try-to-fix-win2lin
...
Fix failures on Win2lin
2016-12-13 08:35:25 -08:00
Sebastiaan van Stijn
59a496e664
Merge pull request #29361 from thaJeztah/update-service-ps-reference
...
Update reference docs for service ps
2016-12-13 16:59:37 +01:00
Vincent Demeester
cda04547c0
Merge pull request #29000 from yongtang/24352-swarm-update-no-flags
...
Show usage when `docker swarm update` has no flags
2016-12-13 16:07:02 +01:00
Vincent Demeester
525c7bb930
Merge pull request #29359 from yuexiao-wang/fix-network-option
...
Fix the option name for network
2016-12-13 15:20:25 +01:00
yuexiao-wang
b101e451f1
Fix the incorrect option name
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-14 04:10:09 +08:00
Vincent Demeester
96ac223a13
Merge pull request #29346 from xlgao-zju/just-return-assignment
...
Get rid of err altogether by just returning the assignment
2016-12-13 15:19:45 +01:00
Vincent Demeester
c2b7480604
Merge pull request #29335 from tophj-ibm/skip-plugin-test
...
[integration-cli] skip plugin tests on non-x86
2016-12-13 14:54:41 +01:00
Yong Tang
5aa5a1cb00
Show usage when docker swarm update has no flags
...
This fix tries to address the issue raised in 24352. Previously,
when `docker swarm update` has no flags, the output is
```
Swarm updated.
```
even though nothing was updated. This could be misleading for
users.
This fix tries to address the issue by adding a `PreRunE` function
in the command so that in case no flag is provided (`cmd.Flags().NFlag() == 0`),
the usage will be outputed instead.
An integration has been added to cover the changes.
This fix fixes 24352.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-13 05:05:04 -08:00
Sebastiaan van Stijn
5902fa3384
Update reference docs for service ps
...
commit bbd2018ee1
2016-12-13 13:30:58 +01:00
Vincent Demeester
1bc942597d
Merge pull request #29216 from allencloud/add-status-code-403-for-services-create
...
add missing status code 403 for services/create in docs
2016-12-13 12:27:56 +01:00
Vincent Demeester
ce9960a9b2
Merge pull request #29348 from lixiaobing10051267/masterMount
...
modify some wrong func information in device_tool.go
2016-12-13 12:23:43 +01:00
Vincent Demeester
3b9646b4a4
Merge pull request #29352 from lixiaobing10051267/masterStack
...
stack_config.md not exist and delete it in other files
2016-12-13 12:18:13 +01:00
Vincent Demeester
e857785df4
Fixing win2lin builds by adding a testRequires to DockerDaemonSuite
...
The success of the win2lin CI before was really "by chance" on the
DockerDaemonSuite : the DockerDaemonSuite was panicking when starting
the daemon on the first non-skipped test.The suite panicked but as
the error returned from `StartWithBusybox` was nil, the test kept
going and was OK because the client had all the correct environment
variables set up to discuss with the remote daemon.
Then, as the suite panicked, no more test attached on the
DockerDaemonSuite ran (that's why on win2lin, `DockerDaemonSuite` was
only composed by 5 tests !). The really bad thing is, we didn't get
any report of the panic on the suite (go-check hiding something
somewhere).
As DockerDaemonSuite needs to run test on the same host as it's
running, this adds a `SameHostDaemon` requirement to the Suite.
This changes also make sure `TestRestartContainerWithRestartPolicy`
does left weirdies behind it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-13 12:04:53 +01:00
lixiaobing10051267
afaff51a8b
stack_config.md not exist and delete it
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-13 18:06:18 +08:00
lixiaobing10051267
cde57a0d56
modify some wrong func information in device_tool.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-13 17:49:03 +08:00
Vincent Demeester
7f44e09797
Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect
...
deprecate "top-level" network information in NetworkSettings
2016-12-13 08:58:57 +01:00
Vincent Demeester
3d52c86d4c
Merge pull request #29267 from yuexiao-wang/fix-bulid-para
...
Update the option for docker build
2016-12-13 08:55:20 +01:00
yuexiao-wang
cd317282c9
Update the option 'network' for docker build
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-13 18:18:53 +08:00
Xianglin Gao
da5d3cccc4
Get rid of err altogether by just returning the assignment
...
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
2016-12-13 14:25:57 +08:00
allencloud
0270645c13
return not a swarm when unlock
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-13 10:38:45 +08:00
Victor Vieux
e9076c0f00
Merge pull request #29337 from anusha-ragunathan/unmount_enable_err
...
When plugin enable fails, unmount PropagatedMount.
2016-12-12 16:02:16 -08:00
