Akihiro Suda
e7769e29e0
Merge pull request #28369 from yongtang/11132016-completion-dns-option
...
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
2016-11-14 16:39:28 +09:00
Lei Jitang
2b5f1050cc
Merge pull request #28370 from yongtang/11132016-docs-typo
...
Fix a small typo in `docs/deprecated.md`
2016-11-14 13:34:03 +08:00
Yong Tang
45e5b2552a
Fix a small typo in `docs/deprecated.md`
...
A small typo in `docs/deprecated.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-13 20:04:25 -08:00
Yong Tang
fb8404a348
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
...
In 28186, `dns-options-add/rm` has been changed to `dns-option-add/rm`
in `docker service create/update`, for the purpose of consistency.
This fix updates bash completion to remove extra `s`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-13 19:12:01 -08:00
Brian Goff
d8a7b13cd6
Merge pull request #28367 from miaoyq/fix-a-comment-err
...
Fix a comment error
2016-11-13 21:12:59 -05:00
Yanqiang Miao
19e2c9177a
Fix a comment error
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-14 09:55:27 +08:00
Vincent Demeester
0f20d6f5ab
Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
...
judge manager before getting secret
2016-11-13 22:19:07 +01:00
Akihiro Suda
f39cb08209
Merge pull request #28362 from albers/completion-service-dns
...
Add bash completion for DNS settings in services
2016-11-14 05:42:24 +09:00
Vincent Demeester
e649cc1476
Merge pull request #28360 from albers/completion-service-ps--all
...
Add bash completion for `docker service ps --all`
2016-11-13 21:39:07 +01:00
Vincent Demeester
f1dd4c5ad8
Merge pull request #28357 from sdurrheimer/zsh-completion-service-ports
...
Add zsh completion for 'docker service {create --port, update --port-…
2016-11-13 21:38:17 +01:00
Vincent Demeester
bf2c875cd6
Merge pull request #28355 from sdurrheimer/zsh-completion-build-cache-from
...
Add zsh completion for 'docker image build --cache-from'
2016-11-13 21:37:10 +01:00
Vincent Demeester
7220888b09
Merge pull request #28342 from albers/completion-build--cache-from
...
Add bash completion for `docker build --cache-from`
2016-11-13 21:34:55 +01:00
Vincent Demeester
1e673b9876
Merge pull request #28310 from mlaventure/docker-info-update
...
Docker info binaries version update
2016-11-13 21:24:51 +01:00
Harald Albers
28dc8c863a
Add bash completion for DNS settings in services
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-13 11:17:18 -08:00
Harald Albers
188d2fac57
Add bash completion for `docker service ps --all`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-13 09:32:53 -08:00
Doug Davis
3be885cd89
Merge pull request #28359 from allencloud/fix-typo-in-node-update-docs
...
fix typo in node update docs
2016-11-13 10:41:09 -06:00
allencloud
7bbbc8c7f1
fix typo in node update docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-14 00:07:52 +08:00
Akihiro Suda
de5d4701e3
Merge pull request #28356 from albers/completion-fix-ps--filter-is-task
...
Fix bash completion for `docker ps --filter is-task`
2016-11-14 00:18:14 +09:00
Steve Durrheimer
36916ae2ad
Add zsh completion for 'docker service {create --port, update --port-{add,rm}}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-13 14:21:13 +01:00
Harald Albers
7b6a38e1b1
Fix bash completion for `docker ps --filter is-task`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-13 04:54:54 -08:00
Steve Durrheimer
ac50074258
Add zsh completion for 'docker image build --cache-from'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-13 13:52:52 +01:00
allencloud
1addb4817b
judge manager before getting secret
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-13 12:52:09 +08:00
Harald Albers
c6357f04b5
Add bash completion for `docker build --cache-from`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-12 10:12:47 -08:00
Vincent Demeester
c8492ebc5d
Merge pull request #28317 from tonistiigi/amd64-plugin-tests
...
Skip plugin tests if not in amd64
2016-11-12 13:52:42 +01:00
Vincent Demeester
4833915644
Merge pull request #28333 from chchliang/wordcode
...
`dont` spell error
2016-11-12 13:51:53 +01:00
Vincent Demeester
eb131c5383
Merge pull request #28330 from YuPengZTE/devCtx
...
context.Context should be the first parameter of a function
2016-11-12 13:18:17 +01:00
chchliang
167f2f3f1b
don't spell error
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
2016-11-12 14:57:37 +08:00
yupeng
aff5dacec1
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-12 14:14:34 +08:00
Tõnis Tiigi
851d9149b1
Merge pull request #28309 from LK4D4/fix_non_autogen
...
dockerversion: add other binaries to _lib.go
2016-11-11 15:39:00 -08:00
Brian Goff
c03900ab30
Merge pull request #28323 from Microsoft/jjh/typoinremoteapi1.25
...
Extra v1.25 in API docs
2016-11-11 16:39:18 -05:00
John Howard
beccd3663f
Extra v1.25 in API docs
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-11 12:50:05 -08:00
Vincent Demeester
744d9dac10
Merge pull request #28306 from ehazlett/service-create-no-secrets
...
only check secrets for service create if requested
2016-11-11 20:58:40 +01:00
Victor Vieux
6a747fcf57
Merge pull request #28318 from vieux/bump_version
...
bump version to 1.14.0-dev
2016-11-11 10:29:15 -08:00
Victor Vieux
3c5e09f5e9
Merge pull request #28275 from vieux/1.13.0_changelog
...
add 1.13.0 CHANGELOG.md
2016-11-11 09:57:45 -08:00
Tonis Tiigi
e23e36f25c
Skip plugin tests if not in amd64
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-11 09:52:13 -08:00
Victor Vieux
6f3720ca9e
Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
...
Add information for `Manager Addresses` in the output of `docker info`
2016-11-11 09:30:01 -08:00
Victor Vieux
2712bb26e3
Merge pull request #28274 from Microsoft/jjh/acl
...
Windows: create daemon root with ACL
2016-11-11 09:20:32 -08:00
Antonio Murdaca
0dfeeac206
Merge pull request #28307 from albers/completion-dockerd--seccomp-profile
...
Add bash completion for `docker daemon --seccomp-profile`
2016-11-11 17:42:11 +01:00
Tõnis Tiigi
d06b1e2cc2
Merge pull request #28285 from vieux/try_arm_fix_libnetwor
...
update libnetwork to fix ARM tests
2016-11-11 08:32:29 -08:00
Brian Goff
de325535d4
Merge pull request #27872 from vdemeester/images-filter-filters
...
Add reference filter and deprecated filter param…
2016-11-11 11:24:19 -05:00
Kenfe-Mickael Laventure
17df5593eb
Remove extra binaries commit variables from windows build
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-11 08:24:17 -08:00
Kenfe-Mickael Laventure
69f0402585
Fix version detection for docker-init
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-11 08:19:32 -08:00
Sebastiaan van Stijn
e8469c0e63
Merge pull request #28297 from vdemeester/compose-swarm-openstdin
...
Add support for stdin_open in compose to swarm
2016-11-11 17:09:04 +01:00
Alexander Morozov
e60e54c12a
dockerversion: add other binaries to _lib.go
...
Otherwise it's impossible to build without autogen tag
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-11 07:56:10 -08:00
Brian Goff
e0280c568a
Merge pull request #28299 from vdemeester/compose-swarm-extra_hosts
...
Add support for extra_hosts in compose to swarm
2016-11-11 10:54:53 -05:00
Yong Tang
828bd441eb
Add information for `Manager Addresses` in the output of `docker info`
...
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.
The information is available in `info.Swarm.RemoteManagers`.
This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.
A test has been added for this fix.
This fix fixes 28018.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-11 07:35:32 -08:00
Harald Albers
98a2071696
Add bash completion for `docker daemon --seccomp-profile`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-11 16:12:17 +01:00
Evan Hazlett
8dfdecbd2b
only check secrets for service create if requested
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-11-11 10:07:24 -05:00
Vincent Demeester
820b809e70
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:34:01 +01:00
Vincent Demeester
f32869d956
Add support for extra_hosts in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:20:02 +01:00