Commit graph

31655 commits

Author SHA1 Message Date
Vincent Demeester
b86efd2707 Merge pull request #32081 from albers/completion-network-ls--filter-scope
Add bash completion for `network ls --filter scope`
2017-03-24 14:52:03 +01:00
Harald Albers
4dd461a6bf Add bash completion for network ls --filter scope
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-24 13:06:26 +01:00
Sebastiaan van Stijn
4e290f7a2b Merge pull request #31529 from yongtang/31324-network-ls-filter-scope
Add `--filter scope=swarm|local` for `docker network ls`
2017-03-24 12:26:10 +01:00
uhayate
208653e712 update 3 old docs about secret in docs/reference/commandline/
Signed-off-by: uhayate <uhayate.gong@daocloud.io>
2017-03-24 18:42:38 +08:00
Vincent Demeester
9a2dcf6a15 Merge pull request #32071 from tonistiigi/fix-integration-tests
Fix integration tests build errors
2017-03-24 10:30:42 +01:00
Vincent Demeester
8d2a82853c Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
[compose/interpolation] Make sure we error out instead of panic during interpolation
2017-03-24 09:00:06 +01:00
Tonis Tiigi
4c7710d5d0 Fix integration tests build errors
Caused by a merge conflict.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-24 00:27:32 -07:00
Akihiro Suda
8008f65293 Merge pull request #31608 from vdemeester/integration-cli-package
[test-integration] Introduce a `cli` package for test-integration
2017-03-24 13:04:47 +09:00
Tõnis Tiigi
2fa8fe400d Merge pull request #31257 from tonistiigi/nested-build
build: add multi-stage build support
2017-03-23 19:14:13 -07:00
Yong Tang
704ea8f6b4 Add --filter scope=swarm|local for docker network ls
This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.

As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.

This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.

Related docs has been updated.

Additional unit test cases have been added.

This fix fixes 31324.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-03-23 18:48:11 -07:00
Tibor Vass
caf8d884aa Merge pull request #31629 from darrenstahlmsft/ShutdownLock
Windows: Stop holding client container lock during shutdown
2017-03-23 18:16:56 -07:00
Tonis Tiigi
684633f734 Fix relative path on windows for uuid paths
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-23 15:12:19 -07:00
Tonis Tiigi
f95f58283b Add support for COPY from previous rootfs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-23 15:12:15 -07:00
Christopher Jones
a96bf0fb2f Fix flaky test DockerRegistryAuthTokenSuite.TestPushMisconfiguredTokenServiceResponseError
Fixes test by bumping retry count from 4 to 10

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-03-23 18:10:11 -04:00
Brian Goff
b47c50cf11 Merge pull request #31668 from Microsoft/jjh/nopidfileasservice
Windows: no pidfile when service
2017-03-23 17:10:35 -04:00
Brian Goff
c1d40ade5d Merge pull request #31626 from darrenstahlmsft/WindowsUpdateContainer
Windows: Add missing HostConfig fields to update block
2017-03-23 16:54:03 -04:00
Brian Goff
fd56e8ffa1 Merge pull request #32019 from anusha-ragunathan/plugin-sigkill
Add missing test for daemon kill with plugins running.
2017-03-23 15:46:59 -04:00
John Howard (VM)
4f7db6739d Revendor HCSShim @ v0.5.13
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-03-23 11:47:05 -07:00
Vincent Demeester
50c4475df6
Introduce a cli package for test-integration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-23 18:35:22 +01:00
John Howard (VM)
53d6aadda5 Windows: Remove --credentialspec flag
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
2017-03-23 10:01:04 -07:00
Sebastiaan van Stijn
ad530ffee0 Merge pull request #31986 from Microsoft/jjh/fix28267
Windows: Don't close client stdin handle to avoid hang
2017-03-23 16:35:54 +01:00
Vincent Demeester
c165a8bfa1
Make sure we error out instead of panic during interpolation
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-23 16:09:57 +01:00
Vincent Demeester
d9ecb1b8fe Merge pull request #32028 from sdurrheimer/zsh-completion-service-ls-mode-filter
Add zsh completion for 'docker service ls --filter mode'
2017-03-23 14:19:36 +01:00
Vincent Demeester
f438cf6c7a Merge pull request #32029 from sdurrheimer/zsh-completion-secret-ls-format
Add zsh completion for 'docker secret ls --format'
2017-03-23 14:19:14 +01:00
Greg Pflaum
44cdab1fc5
Fix indenting in table of contents
Fixes #30841. The "filter" section had the wrong header size, which
caused sections following it to have the wrong indentation in the
right-side table of contents.

Signed-off-by: Greg Pflaum <gpflaum@users.noreply.github.com>
2017-03-22 23:31:13 -04:00
Brian Goff
64eff3e218 Merge pull request #32021 from tophj-ibm/fix-notary-vendor-p
[ppc64le] fix notary vendor
2017-03-22 22:08:42 -04:00
Brian Goff
6fe5eb010e Merge pull request #32020 from sdurrheimer/zsh-completion-service-create-update-rollback-on-failure
Add zsh completion for 'docker service {create,update} --rollback-*'
2017-03-22 22:02:51 -04:00
Brian Goff
cf4589666b Merge pull request #32025 from sdurrheimer/zsh-completion-service-logs-formatting
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
2017-03-22 22:02:14 -04:00
Brian Goff
7a607efcd6 Merge pull request #32022 from sdurrheimer/zsh-completion-service-create-update-stop-signal
Add zsh completion for 'docker service {create,update} --stop-signal'
2017-03-22 22:01:15 -04:00
Brian Goff
18cf0a5910 Merge pull request #32026 from sdurrheimer/zsh-completion-network-inspect-verbose
Add zsh completion for 'docker network inspect --verbose'
2017-03-22 21:59:26 -04:00
Brian Goff
b573c23e6b Merge pull request #32017 from sdurrheimer/zsh-completion-build-add-host
Add zsh completion for 'docker build --add-host'
2017-03-22 21:58:47 -04:00
Brian Goff
9e538fb4b0 Merge pull request #32024 from sdurrheimer/zsh-completion-service-create-update-placement-ref
Add zsh completion for 'docker service {create,update} --placement-pref'
2017-03-22 21:58:26 -04:00
Aaron Lehmann
9b33edfa7e Merge pull request #31631 from aaronlehmann/swarm-failure-on-startup
cluster: Proceed with startup if cluster component can't be created
2017-03-22 16:40:49 -07:00
Steve Durrheimer
4147048256
Add zsh completion for 'docker secret ls --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 23:56:29 +01:00
Steve Durrheimer
94b6e810e0
Add zsh completion for 'docker service ls --filter mode'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 23:52:36 +01:00
Steve Durrheimer
b30906e29c
Add zsh completion for 'docker network inspect --verbose'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 23:35:07 +01:00
Steve Durrheimer
415e453a55
Add zsh completion for 'docker service {create,update} --placement-pref'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 23:30:22 +01:00
Steve Durrheimer
516edbcabb
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 23:26:33 +01:00
Vincent Demeester
bb1ae453a6 Merge pull request #32002 from vdemeester/compose-remove-type-dict
Remove compose types.Dict alias
2017-03-22 23:08:09 +01:00
Steve Durrheimer
6121a011ba
Add zsh completion for 'docker service {create,update} --stop-signal'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 22:49:57 +01:00
Christopher Jones
28b99648ae
[ppc64le] fix notary vendor link
Notary switched to vendor a while ago, so make that change here. Change
is consistent with all other dockerfiles.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-03-22 17:47:23 -04:00
Steve Durrheimer
169745ce29
Add zsh completion for 'docker service {create,update} --rollback-*'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 22:40:46 +01:00
Anusha Ragunathan
b748debb76 Add missing test for daemon kill with plugins running.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-22 14:38:55 -07:00
Steve Durrheimer
fbedc588be
Add zsh completion for 'docker build --add-host'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-22 22:28:09 +01:00
Anusha Ragunathan
bbce24997c Merge pull request #31930 from anusha-ragunathan/authz-disable
When authz plugin is disabled, remove from authz middleware chain.
2017-03-22 14:17:38 -07:00
Tibor Vass
0caced4644 Merge pull request #31715 from anusha-ragunathan/ipc-host
Add support in plugin config for accessing host ipc and pid namespace.
2017-03-22 14:17:21 -07:00
Sebastiaan van Stijn
dab6c7d4f2 Merge pull request #31982 from ffoysal/Files-with-special-characters-in-ADD-and-COPY
example of ADD and COPY with special characters file name
2017-03-22 20:17:40 +01:00
Foysal Iqbal
dacf8fa27c remove the duplicate line from doc and rebase with master for 'example of ADD and COPY with special characters file name'
Signed-off-by: Foysal Iqbal <foysal.iqbal.fb@gmail.com>
2017-03-22 15:08:17 -04:00
Anusha Ragunathan
38de272bd4 When authz plugin is disabled, remove from authz middleware chain.
When the daemon is configured to run with an authorization-plugin and if
the plugin is disabled, the daemon continues to send API requests to the
plugin and expect it to respond. But the plugin has been disabled. As a
result, all API requests are blocked. Fix this behavior by removing the
disabled plugin from the authz middleware chain.

Tested using riyaz/authz-no-volume-plugin and observed that after
disabling the plugin, API request/response is functional.

Fixes #31836

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-03-22 12:07:39 -07:00
John Howard
c33c457852 Merge pull request #31980 from JohnMaguire/doc-update
Add note regarding Windows VOLUME limitations
2017-03-22 12:01:36 -07:00